Merge from emacs-23

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

diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 4c6aee15d1d7ff77b1a8a4427df7ddd611483854..b63bd15f4eaf7b142f66c2e22e87a1dab9677c0d 100644 (file)
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -1,7 +1,7 @@
 ;;; ediff-merg.el --- merging utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff