Merge from trunk.

1 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d89e361c59..86a352c4cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+2012-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         configure: new option --enable-gcc-warnings (Bug#11207)
         I have been using this change for many months in my private copy
@@ -15,11 +15,13 @@
         * lib/Makefile.am (AM_CFLAGS): New macro.
         * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
 
+2012-04-10  Glenn Morris  <rgm@gnu.org>
+
+        * configure.in: Conditionally generate admin/unidata/Makefile.
+
 2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * info/dir (File):
-        * Makefile.in: Add emacs-gnutls to the info directory and the
-        INFO_FILES target.
+        * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls manual.
 
 2012-04-09  Glenn Morris  <rgm@gnu.org>