Merge remote-tracking branch 'origin/no-gnus'

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b4639f..e3bf51c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-rescale-image): Allow viewing large images.
+       (shr-rescale-image): Fix wrong merge.
+
+2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnml.el (nnml-request-compact-group): Delete the marks file after
+       compaction (bug#10800).
+
+       * gnus-art.el (gnus-stop-downloads): Stop `url-queue' downloads on
+       group exit.
+
+       * nnimap.el (nnimap-parse-flags): Parse correctly when we have mixed
+       QRESYNC/FETCH output.
+
 2012-02-11  Glenn Morris  <rgm@gnu.org>
 
        * sieve-manage.el (sieve-manage-default-stream):