Merge from emacs-23

[gnu-emacs] / src / ChangeLog.4

diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index c853ad7b4a616fa853d45493a64c11574316da23..a50f6c3842e87c4cb2befc1c4a98a99c7b4e592e 100644 (file)
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6906,7 +6906,7 @@ See ChangeLog.3 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
        Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.