Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 97-100)

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

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

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

1 files changed, 4 insertions, 1 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 732c18c980d..5b096844f37 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,10 +1,13 @@
+2007-08-24  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)
+
+        * message.texi (MIME): Replace mml-attach with mml-attach-file.
+
 2007-08-22  Carsten Dominik  <dominik@science.uva.nl>
 
         * org.texi (Adding hyperlink types): New section.
         (Embedded LaTeX): Chapter updated because of LaTeX export.
         (LaTeX export): New section.
         (Using links out): New section.
-        
 
 2007-08-22  Glenn Morris  <rgm@gnu.org>