Merge from emacs-23

[gnu-emacs] / doc / man / ChangeLog

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 55e38e33a0a6a3bbd33ab1468fd33c40fa79d272..ec117affda2a90dac762eb6ca641dd479d5851dc 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -110,7 +110,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+    Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.