From: Glenn Morris <rgm@gnu.org>
Date: Sat, 29 Mar 2008 22:43:16 +0000 (+0000)
Subject: Fix merge mistake.
X-Git-Tag: emacs-pretest-23.0.90~6788
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9ce91aecbf87ac6c6ce91e5f0d219cf3e60b15c;p=emacs.git

Fix merge mistake.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2a2b5b9bc2d..e908b8f2761 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -63,11 +63,6 @@
 	* gnus-win.el (gnus-configure-frame, gnus-all-windows-visible-p):
 	Prefer fboundp to functionp so it works with macros as well.
 
-2008-03-19  Glenn Morris  <rgm@gnu.org>
-
-	* tls.el (open-tls-stream): Restore use of `tls-end-of-info'.
-	Accidentally removed in the sync process with Emacs.
-
 2008-03-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* message.el (message-alter-recipients-discard-bogus-full-name): New