Merge from origin/emacs-24

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

diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index ce8d82f9f81200a511c23d8dcb87d7c17c881522..b7a0ebf69aa4ea1b081afeb0807e377b5827ed41 100644 (file)
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -1217,7 +1217,7 @@
 
 See ChangeLog.04 for earlier changes.
 
-    Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+       Copyright (C) 2005-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -1238,4 +1238,3 @@ See ChangeLog.04 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: 70f1733a-3e2f-43c2-91c3-d9ace93f82ba