Merge remote branch 'origin/no-gnus'

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75eb610..b02af02 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -107,6 +107,15 @@
 
 2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-start.el (gnus-read-newsrc-el-file): Protect against broken
+       .newsrc.el files.
+
+2012-04-05  Bastien Guerry  <bzg@altern.org>
+
+       * color.el (color-lighten-name): Fix typo.
+
 2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * auth-source.el (auth-source-netrc-create): Quote tokens that contain
@@ -208,13 +217,6 @@
 
        * 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.
@@ -226,6 +228,13 @@
        * 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