Merge from origin/emacs-24

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

diff --git a/lisp/erc/ChangeLog.07 b/lisp/erc/ChangeLog.07
index 09886ad4a72ec8d8af9b22e2e013ac3cb0408845..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-2012 Free Software Foundation, Inc.
+       Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.