Merge from emacs-23

[gnu-emacs] / lisp / ChangeLog.6

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index e5bd7fa9d27bcb29d5d489a83234d8b00f6fb2ad..3626be96a1ad8a2b565b1402ebff32fdcc5b4b3e 100644 (file)
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -8023,7 +8023,7 @@ See ChangeLog.5 for earlier changes.
 ;; End:
 
     Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+      2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.