Merge remote branch 'origin/no-gnus'

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a70794d..88cdcca 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -291,6 +291,20 @@
 
 2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+2012-06-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el: Add a iso-8859-1 cookie to make stuff work under other
+       locales.
+
+2012-05-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is
+       a string so that Gcc works (bug#11514).
+
+2012-04-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * gnus.el (debbugs-gnu): Don't override existing autoload definition.
+
 2012-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-msg.el (gnus-inews-insert-gcc): Don't do the alist stuff when we
@@ -423,6 +437,13 @@
 
        * gnus-start.el (gnus-1): Avoid duplicate entries.
 
+2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
+       application/octet-stream parts really is.
+
+       * gnus-sum.el (gnus-propagate-marks): Remove.
+
 2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * imap.el: Remove.
@@ -434,13 +455,6 @@
        * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
        Gnus 0.3.
 
-2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
-
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
-
-       * gnus-sum.el (gnus-propagate-marks): Remove.
-
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * shr.el (shr-rescale-image): Undo previous change; see