From: Glenn Morris <rgm@gnu.org>
Date: Wed, 27 Jun 2012 06:55:01 +0000 (-0700)
Subject: Fix ChangeLog entry from trunk 2012-06-27T03:52:02Z!jwiegley@gmail.com.
X-Git-Tag: emacs-24.2.90~1199^2~326
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7983050d181d2fd4020db5f3736ed94d104aea5d;p=emacs.git

Fix ChangeLog entry from trunk 2012-06-27T03:52:02Z!jwiegley@gmail.com.
For some reason, this included an extraneous entry from the emacs-24
branch.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4614ba09b3d..c9d10c50717 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -175,11 +175,6 @@
 	when time_t is unsigned and as wide as intmax_t.
 	See <http://bugs.gnu.org/9000#51>.
 
-2012-06-26  Andreas Schwab  <schwab@linux-m68k.org>
-
-	* gnutls.c (emacs_gnutls_handshake): Only retry if
-	GNUTLS_E_INTERRUPTED.
-
 2012-06-23  Eli Zaretskii  <eliz@gnu.org>
 
 	* dispnew.c (sit_for, Fsleep_for):