Merge from mainline.

[gnu-emacs] / lisp / ChangeLog.2

diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index 3382aeb522af4d438f1248f58846fac59af0ae52..e3193944011e9a11e415877934f6805ee320f3b9 100644 (file)
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -3993,7 +3993,7 @@
 See ChangeLog.1 for earlier changes.
 
     Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
-       2007, 2008  Free Software Foundation, Inc.
+       2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.