changeset 93395:79d7508228c3

Fix merge mistake.
author Glenn Morris <rgm@gnu.org>
date Sat, 29 Mar 2008 22:43:16 +0000
parents 789028492ded
children c15f559a5ada
files lisp/gnus/ChangeLog
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Sat Mar 29 22:22:07 2008 +0000
+++ b/lisp/gnus/ChangeLog	Sat Mar 29 22:43:16 2008 +0000
@@ -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