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

diff --cc lisp/ChangeLog
index eef216a,c8174e9..5e7adfb
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,11 +1,13 @@@
+ 2010-09-01  Teodor Zlatanov  <tzz@lifelogs.com>
+ 
+       * gnus-html.el (gnus-html-wash-tags)
+       (gnus-html-schedule-image-fetching, gnus-html-image-url-blocked-p):
+       Better logging.
+ 
  2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +      * nndoc.el (nndoc-type-alist): Added a new type for Google digests. 
 +
        * gnus-html.el (gnus-html-wash-tags): Check the value of
        gnus-blocked-images in the summary buffer.
  

diff --cc lisp/gnus-html.el
Simple merge