Merge from emacs-23; up to 2010-06-22T07:41:10Z!rgm@gnu.org

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

diff --git a/lisp/erc/ChangeLog.06 b/lisp/erc/ChangeLog.06
index 3f69f164e08f09b6ae6e8a4e7793946985aeb1f1..e3026c96a4daa1a3b8599cd142c672713fc2013e 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, 2011 Free Software Foundation, Inc.
+       Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -1452,4 +1452,3 @@ See ChangeLog.05 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a