Merge from origin/emacs-24

[gnu-emacs] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index f89d5a2d0439b2a10639d3ebb0d8b9caebe5df4a..22ebae4576ca439fbe7c82e1250fd450e5660e7e 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-03  Kelvin White  <kwhite@gnu.org>
+
+       * erc.el: Add old version string back to file header for
+       package.el compatibility
+
+2015-03-03  Glenn Morris  <rgm@gnu.org>
 2015-03-03  Glenn Morris  <rgm@gnu.org>
 
        * erc.el (erc-rename-buffers): Doc fix.  Add :version.