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

diff --combined lisp/ChangeLog
index 30296e6,713b81a..1b87be5
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,11 +1,11 @@@
+ 2010-10-05  Florian Ragwitz  <rafl@debian.org>  (tiny change)
+ 
+       * sieve-manage.el (sieve-manage-default-stream): Make default stream
+       customizable.
+ 
+       * gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid
+       handing broken links to browse-url.
+ 
  2010-10-05  Julien Danjou  <julien@danjou.info>
  
        * gnus-util.el (gnus-emacs-completing-read)
@@@ -25,9 -33,6 +33,9 @@@
  
  2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +      * nnimap.el (nnimap-open-connection): Give an error if nnimap-stream is
 +      unknown.
 +
        * shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.
        (shr-get-image-data): Ensure against the cache file missing.