lisp/ChangeLog: Merge from emacs-24; up to r117596 (Emacs trunk)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b22b03..888125e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
-2014-10-15  Jorge A. Alfaro-Murillo  <jorge.alfaro-murillo@yale.edu> (tiny change)
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+       * Merge in all changes up to 24.4 release.
+
+2014-10-15  Jorge A. Alfaro-Murillo  <jorge.alfaro-murillo@yale.edu>  (tiny change)
 
        * message.el (message-insert-signature): Use `newline' instead of
        inserting explicit "\n".