merge trunk

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

diff --git a/lisp/erc/ChangeLog.08 b/lisp/erc/ChangeLog.08
index d07a707d6f4a3d29446770443b1fc5d357e53c9d..d0a30163aa3a0ffbfda3921814ae12393582cd47 100644 (file)
--- a/lisp/erc/ChangeLog.08
+++ b/lisp/erc/ChangeLog.08
@@ -405,7 +405,7 @@
 
 See ChangeLog.07 for earlier changes.
 
-    Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+       Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -427,4 +427,3 @@ See ChangeLog.07 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 15787dfd-e091-4c8c-8b88-747b474e1ac7