Merge branch 'emacs-24'.

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index a23524af11f88308acc49de9b401d04cafe884f9..09dfd7f2e3597e176a17b4d72144a21d7287877b 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Lessen focus on ChangeLog files, as opposed to change log entries.
+       * CONTRIBUTE: Give advice about git commit messages and how
+       to generate proposed patches containing them.
+
 2014-11-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * NEWS: Mention dom.el.
@@ -101,7 +107,7 @@
 
        * NEWS: Mention ns-use-fullscreen-animation.
 
-2014-09-30  Bill Wohler         <wohler@newt.com>
+2014-09-30  Bill Wohler  <wohler@newt.com>
 
        Release MH-E version 8.6