1 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ab0a8e76f8..2e3c32dacb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2012-12-21 AC_PROG_MKDIR_P: port workaround to pre-2.62 Autoconf
+        2012-12-20 AC_PROG_MKDIR_P: don't workaround if not buggy
+        2012-12-17 filemode, sys_stat: Handle MPX files a la AIX.
+
 2012-12-21  Akinori MUSHA  <knu@iDaemons.org>  (tiny change)
 
         * Makefile.in (install-arch-dep): Ignore chmod errors.  (Bug#13233)