Merge from cygw32 branch

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

diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index 804e62a293358e478d924fc6932cd5930a44bf67..195b177bbc9e6bb8acf9cdf5cebf4e390ed51ddf 100644 (file)
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -1,6 +1,6 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
-;; Copyright (C) 1995-1997, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995-1997, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff