Merge from emacs-23

[gnu-emacs] / lisp / erc / ChangeLog.06

diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index a1a196b79aacbb0efe2821d444f7687f8f25213e..3f69f164e08f09b6ae6e8a4e7793946985aeb1f1 100644 (file)
--- a/lisp/erc/ChangeLog.06
+++ b/lisp/erc/ChangeLog.06
@@ -1430,7 +1430,7 @@
 
 See ChangeLog.05 for earlier changes.
 
-    Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.