Merge from emacs-23

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

diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index 06a600f0af4fbbb7887fb29f3d278e12b3caf77c..b77f5f2aafad63fbffbffeb8f6cef753b013ed0f 100644 (file)
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -1,7 +1,7 @@
 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff