Merge from emacs-23

[gnu-emacs] / src / ChangeLog.2

diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 0397478f09d02eab0066532a76eb66b8b7d9e956..ace0a064a8103d6e58bac12bdbdc68549629dd1c 100644 (file)
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4772,7 +4772,7 @@
 See ChangeLog.1 for earlier changes.
 
     Copyright (C) 1986, 1987, 1988, 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.