ERC: Sync from upstream.

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

diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index 12a51bb44ed15c3773c3a40a0ab7e7807b0a901a..158d86b888536821431777d4fe6d051fea2b3667 100644 (file)
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -1217,13 +1217,13 @@
 
 See ChangeLog.04 for earlier changes.
 
-    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+    Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,