Merge from emacs-23

[gnu-emacs] / lisp / vc / ediff-vers.el

diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index 581aad3e4dc4ec69d783f193b9889dbdcd3e7ccb..487c5e80786b0ce37bffaba911c8ed5bf1ffa40f 100644 (file)
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -1,7 +1,7 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff