Merge changes from emacs-23 branch.

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

diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index f3dab0a0b2ba14e24e9e93d50bc28df6a20443bb..a1cbab740be95a84918ad956298875aa545081d0 100644 (file)
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -72,7 +72,7 @@
 2004-12-24  Jorgen Schaefer  <forcer@users.sourceforge.net>
 
        * erc-goodies.el, erc.el: The Small Extraction of Stuff[tm] commit.
-        Moved some functions from erc.el to erc-goodies.el, and
+       Moved some functions from erc.el to erc-goodies.el, and
        transformed them to erc modules in the process.
        - imenu autoload stuff moved.  I don't know why it is here at all.
        - Moved: scroll-to-bottom, make-read-only, distinguish-noncommands,
@@ -2072,7 +2072,7 @@
 
 See ChangeLog.03 for earlier changes.
 
-    Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.