Merge from origin/emacs-24

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 65a112d379ff69231d3f3d3a97ddf989ce1e472b..00775edf52490b7ccda7b70627fde7372156a076 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * build-aux/git-hooks/commit-msg: Allow tabs.
+       Treat them as if they were expanded to spaces, with tab stops
+       every 8 columns.
+
 2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        * .gitignore: Ignore /conftest*.