merge from no gnus

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5422660..8632a55 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,21 @@
+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-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-record-commands): New variable.
+       (nnimap-log-command): Use it.
+       (nnimap-make-process-buffer): Add a space to the process buffer.
+
+       * shr.el (shr-rescale-image): Allow viewing large images.
+
 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.