Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 14587cfd24e..d019c1e4893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2014-03-26 strftime: wrap macros in "do {...} while(0)"
+        * lib/strftime.c: Update from gnulib.
+
 2014-03-26  Glenn Morris  <rgm@gnu.org>
 
         * configure.ac (CLASH_DETECTION): Remove option.  Every platform