# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1182032978 0
# Node ID 81aba9478fbc11971c14284eaf8c9f513a7ae260
# Parent  56a3f23e0e7456e73e0962c41c059f6193ce7aa3# Parent  7d00a8fdb7e364212d024b7174ffabadc6c7761e
Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 49-50)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 232)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-802

diff -r 56a3f23e0e74 -r 81aba9478fbc lisp/gnus/ChangeLog.2
--- a/lisp/gnus/ChangeLog.2	Sat Jun 16 21:47:37 2007 +0000
+++ b/lisp/gnus/ChangeLog.2	Sat Jun 16 22:29:38 2007 +0000
@@ -7903,7 +7903,7 @@
 	(mml1991-pgg-sign, mml1991-pgg-encrypt): New functions.
 	(mml1991-pgg-encrypt): Fix recipients querying.
 
-2002-09-28  <dme@dme.org>
+2002-09-28  <dme@dme.org>  (tiny change)
 
 	* mml2015.el (autoload): Autoload correct files.