Merge from origin/emacs-24

[gnu-emacs] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 28ac7d38b96a8c1ea878125442094a3a8c5ed47c..ba5d57e4d2eb6e4e566c69437a119421b0471719 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-14  Dima Kogan  <dima@secretsauce.net>
+
+       * erc-backend.el (define-erc-response-handler): Give hook-name
+       default value of nil and add-to-list (bug#19363)
+
 2015-01-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        Don't downcase system diagnostics' first letters