Merge from emacs-23

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

diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index a1cbab740be95a84918ad956298875aa545081d0..39bdfbd8c944d755c1ce3e174f01a15d1dbf6c11 100644 (file)
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -2072,7 +2072,7 @@
 
 See ChangeLog.03 for earlier changes.
 
-    Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.