Merge from emacs-23

[gnu-emacs] / lisp / ChangeLog.1

diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index 6855c935746351442143207fbc80f4fb57b558f4..922c5c9d33222376399be6100c5490bd3ab99af7 100644 (file)
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -3247,7 +3247,7 @@
                Set current buffer variables from defaults
                in case user's init file has changed them.
 
-    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
       Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.