Merge remote-tracking branch 'origin/no-gnus'

diff --cc lisp/ChangeLog
index 28d64ff,26547d1..8d8d545
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,21 -1,11 +1,26 @@@
 +2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * message.el (smtpmail-smtp-user): Silence compiler warning.
 +
 +2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * message.el (message-multi-smtp-send-mail): Also allow specifying the
 +      SMTP user name.
 +
 +2012-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 +
 +      * gnus-sum.el (gnus-summary-show-thread):
 +      next-single-char-property-change may return nil in XEmacs.
 +      (gnus-summary-article-map): Fix typo.
 +
  2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
  
-       * shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix
+       * nnimap.el (nnimap-transform-headers): Remove unused variable.
+       (nnimap-transform-headers): Fix parsing BODYSTRUCTURE elements that
+       have newlines within the strings, and where the UID comes after the
+       BODYSTRUCTURE element (bug#10537).
+ 
+       * shr-color.el (shr-color-set-minimum-interval): Rename to add prefix
        (bug#10732).
  
        * shr.el (shr-insert-document): Add doc string.