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

diff --cc lisp/ChangeLog
index d2a2c23,145d16e..ccb46b4
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,31 -1,8 +1,36 @@@
 +2012-02-08  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-compat.el: Add a compat for the old `url-retrieve'.
 +
 +2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus-compat.el: Make `help-function-arglist' be compatible on Emacs
 +      23.1.
 +
 +2012-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 +
 +      * gnus-sum.el (gnus-summary-show-thread): Revert last two changes.
 +
 +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-09  Lars Ingebrigtsen  <larsi@gnus.org>
+ 
+       * gnus.el (gnus-server-extend-method): Don't add an -address component
+       if the method already has one (bug#9676).
+ 
  2012-02-08  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * gnus-sum.el (gnus-summary-insert-old-articles): Use a default instead

diff --cc lisp/gnus.el
Simple merge