Merge from trunk; add Bug#.

1 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f7ccc573af..8d89e361c59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
 
-        configure: new option --enable-gcc-warnings
+        configure: new option --enable-gcc-warnings (Bug#11207)
         I have been using this change for many months in my private copy
         of Emacs, and have used it to find several bugs.  It's mature
         enough to publish now.
@@ -15,6 +15,12 @@
         * lib/Makefile.am (AM_CFLAGS): New macro.
         * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
 
+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.
+
 2012-04-09  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (leim): Check cd return value.  Pass fewer variables.