diff lisp/ChangeLog.4 @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children 376148b31b5e
line wrap: on
line diff
--- a/lisp/ChangeLog.4	Sat Jan 09 11:27:11 2010 -0500
+++ b/lisp/ChangeLog.4	Sat Jan 16 06:57:09 2010 -0500
@@ -8937,7 +8937,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009  Free Software Foundation, Inc.
+      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.