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

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index 0eb74aa,456781f..08a371f
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2010-09-01  Teodor Zlatanov  <tzz@lifelogs.com>
 +
 +      * gnus-html.el (gnus-html-wash-tags)
 +      (gnus-html-schedule-image-fetching, gnus-html-prefetch-images): Add
 +      extra logging.
 +
+ 2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+       * gnus-html.el (gnus-html-wash-tags): Delete the IMG_ALT region. 
+ 
  2010-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * gnus-html.el (gnus-article-html): Decode contents by charset.

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