Merge from origin/emacs-24

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c00cb2f722a5e26c54bd6357794780425657591e..c721b250112695687f366d0497a5b0ddb4d2a233 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -4,7 +4,6 @@
        for erc-format-nick-function and erc-rename-buffers options.
        (Connecting): fix typo
 
-2015-03-03  Michael Albinus  <michael.albinus@gmx.de>
 2015-03-02  Daniel Colascione  <dancol@dancol.org>
 
        * cl.texi (Iteration Clauses): Mention iterator support.