From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 7 Feb 2012 00:31:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/no-gnus'
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=1092348813c6b3aee4ef30ae7f25998a2469430e

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

1092348813c6b3aee4ef30ae7f25998a2469430e
diff --cc lisp/ChangeLog
index 5c176277d,b9e05c0b3..28d64ff29
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,20 -1,8 +1,23 @@@
 +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
+ 	(bug#10732).
+ 
  	* shr.el (shr-insert-document): Add doc string.
  	(shr-visit-file): Ditto.
  	(shr-remove-trailing-whitespace): New function.