Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 62-64)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
   - (mm-string-to-multibyte): Use Gnus trunk definition.

2005-04-13  Miles Bader  <miles@gnu.org>

   * lisp/gnus/mm-util.el (mm-string-to-multibyte): Use Gnus trunk definition.

2005-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnrss.el (nnrss-node-text): Replace CRLFs (which might be
   contained in text because xml.el decodes entities) with LFs.

1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2dad5e1eb26..aecd7b20c04 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-13  Miles Bader  <miles@gnu.org>
+
+        * mm-util.el (mm-string-to-multibyte): Use Gnus trunk definition.
+
+2005-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nnrss.el (nnrss-node-text): Replace CRLFs (which might be
+        contained in text because xml.el decodes entities) with LFs.
+
 2005-04-11  Lute Kamstra  <lute@gnu.org>
 
         * message.el (message-make-date): Handle byte-compiler warnings