Merge from origin/emacs-24

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4e9c119379d36d5b0f5920db2cff08868ab08899..c00cb2f722a5e26c54bd6357794780425657591e 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-03  Kelvin White  <kwhite@gnu.org>
+
+       * erc.texi (Advanced Usage, Options): Add descriptions and examples
+       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.