From: Glenn Morris <rgm@gnu.org>
Date: Mon, 20 Oct 2014 23:39:44 +0000 (+0000)
Subject: lisp/ChangeLog: Merge from emacs-24; up to r117596 (Emacs trunk)
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=552d7aadfd344233a241e20982873e0ecd9c4d26

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b22b03e0..888125e88 100644
--- 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".