Merge from emacs-24; up to 117698

[gnu-emacs] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 0875994e775c4cc915204693df85ef5e1074c09b..475b99edb935bfdaee08294a904478901f32e026 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-10  Kelvin White  <kwhite@gnu.org>
+
+       * erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el:
+       * erc-button.el: Update version to 24.5.
+
 2014-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc.el (erc-send-input): Bind `str' dynamically (bug#18936).