Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f16d853cb6232482522e1feed54e458f4436cfc..bf60d38b2a3e58b7e07fb14c96e8c64d4da4beb6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * button.el (button-activate, push-button): Doc fix.  (Bug#19628)
+
 2015-01-13  Michael Albinus  <michael.albinus@gmx.de>
 
        * filenotify.el (file-notify-descriptors, file-notify-handle-event):