Merge from emacs--rel--22

[gnu-emacs] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 5f283b44ee0d8248765abda6a9aa2d580bb218f7..33206ab6cd92a17bb99a8a2f544645fef8a252d1 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,10 +1,11 @@
-2007-06-07  Juanma Barranquero  <lekktu@gmail.com>
+2007-06-14  Juanma Barranquero  <lekktu@gmail.com>
 
-       * erc.el (erc-startup-file-list): Fix typo in docstring.
+       * erc-goodies.el (erc-scroll-to-bottom): Remove redundant check.
 
 2007-06-06  Juanma Barranquero  <lekktu@gmail.com>
 
-       * erc.el (erc-show-channel-key-p): Fix typo in docstring.
+       * erc.el (erc-show-channel-key-p, erc-startup-file-list):
+       Fix typo in docstring.
 
 2007-04-01  Michael Olson  <mwolson@gnu.org>