Merge from origin/emacs-24

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

diff --git a/lisp/erc/ChangeLog.07 b/lisp/erc/ChangeLog.07
index 4915fd9d1dd4167beef6b2ee9145476e62706413..9fc04db257697e98d16bc876c696d682db13edde 100644 (file)
--- a/lisp/erc/ChangeLog.07
+++ b/lisp/erc/ChangeLog.07
@@ -812,7 +812,7 @@
 
 See ChangeLog.06 for earlier changes.
 
-    Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+       Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -834,4 +834,3 @@ See ChangeLog.06 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-;; arch-tag: 3369b6e5-96b1-4b32-96cd-9a905c747496