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

diff --combined lisp/ChangeLog
index 09edbdd,0d089f5..481244a
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -4,8 -4,6 +4,8 @@@
        (nnimap-open-connection): Allow anonymous login.
        (nnimap-transform-headers): The chars header is called Chars not
        Bytes.
 +      (nnimap-wait-for-response): Don't infloop if the IMAP connection
 +      drops.
  
        * gnus-art.el (gnus-article-describe-briefly): Fix up typo in last
        patch, found by Knut Anders Hatlen.
@@@ -33,6 -31,10 +33,10 @@@
  
  2010-09-19  Julien Danjou  <julien@danjou.info>
  
+       * gnus-sum.el (gnus-summary-update-mark): Use `subst-char-in-string'
+       rather than `subst-char-in-region' in order to be able to replace ASCII
+       char by UTF-8 ones.
+ 
        * gnus-html.el (gnus-html-prefetch-images): Use `url-retrieve' rather
        than curl.
        (gnus-html-image-fetched): Fix `gnus-html-put-image' call not setting