Merge from origin/emacs-24

f646cd9 * build-aux/git-hooks/commit-msg: Allow tabs.

diff --cc ChangeLog
index 65a112d379ff69231d3f3d3a97ddf989ce1e472b,1b161abf11b64a7d0ffeaa3040de20d0471cfd69..00775edf52490b7ccda7b70627fde7372156a076
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,10 +1,10 @@@
 -2014-12-17  Paul Eggert  <eggert@cs.ucla.edu>
+ 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*.