Merge branch 'master' of https://git.gnus.org/gnus

diff --cc lisp/ChangeLog
index fe339b9,4321ce6..870cedc
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,13 +1,17 @@@
+ 2010-09-22  Julien Danjou  <julien@danjou.info>
+ 
+       * gnus-html.el (gnus-html-image-automatic-caching): Add custom
+       variable.
+       (gnus-html-image-fetched): Only cache if
+       gnus-html-image-automatic-caching is set.
+       (gnus-html-image-fetched): Check for errors.
+ 
  2010-09-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +      * gnus-start.el (gnus-read-active-for-groups): Only run -request-scan
 +      once per method on `g'.  This ensures that backends like nnfolder don't
 +      open all their folders.
 +
        * nnimap.el (nnimap-split-incoming-mail): Delete 'junk.
        (nnimap-request-list): Nix out group in the correct buffer.
        (nnimap-parse-flags): Implement by using `read' instead of