Merge from emacs-23

[gnu-emacs] / lisp / ChangeLog.3

diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 4c36aa94509916ef3c97f677bafc48c7e88ae32f..07b5e8ed6f4c10beec954057e0e40df81c662207 100644 (file)
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -12439,7 +12439,7 @@ See ChangeLog.2 for earlier changes.
 ;; End:
 
     Copyright (C) 1989, 1993, 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.