Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org

[bpt/emacs.git] / lisp / erc / ChangeLog.05

diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index fd5fde0..584d982 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-2011 Free Software Foundation, Inc.
+       Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.