From: Glenn Morris <rgm@gnu.org>
Date: Wed, 2 May 2012 16:14:20 +0000 (-0700)
Subject: Fix merged ChangeLog entry
X-Git-Tag: emacs-24.2.90~471^2~204^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3d6af4d1f67b07bb35b108fa43fb05083ef84d5e;p=emacs.git

Fix merged ChangeLog entry
---

diff --git a/ChangeLog b/ChangeLog
index bf4d53edf4b..2d30d3449f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,9 +10,6 @@
 	* Makefile.in (install-arch-indep, uninstall):
 	Ensure that INSTALL-type commands are run from top-level.
 
-	* Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally
-	omitted from 2012-04-12 backport from trunk.
-
 	* info/dir: Make some entries consistent with the source texi files.
 
 	* configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.