Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index 31975c1,0a90892..ec7910e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,52 -1,20 +1,65 @@@
 +2011-02-09  Teodor Zlatanov  <tzz@lifelogs.com>
 +
 +      * nnimap.el: Autoload `auth-source-forget+'.
 +      (nnimap-open-connection-1): Use it if the connection fails.
 +
 +      * auth-source.el: Require `password-cache'.
 +      (auth-source-hide-passwords, auth-source-cache): Remove and mark
 +      obsolete.
 +      (auth-source-magic): Marker for `password-cache' keys.
 +      (auth-source-do-cache): Update docstring.
 +      (auth-source-search): Use and check cache.
 +      (auth-source-forget-all-cached, auth-source-remember)
 +      (auth-source-recall, auth-source-forget, auth-source-forget+)
 +      (auth-source-specmatchp): Caching support functions.
 +      (auth-source-forget-user-or-password, auth-source-forget-all-cached):
 +      Remove and obsolete.
 +      (auth-source-user-or-password): Remove caching to further discourage
 +      using it.  Always hide passwords.
 +
 +      * password-cache.el (password-cache-remove): Accept secrets that are
 +      not strings.
 +
+ 2011-02-09  Lars Ingebrigtsen  <larsi@gnus.org>
+ 
+       * nntp.el (nntp-retrieve-group-data-early-disabled): Disable the async
+       code for now, since it doesn't work for all users.
+ 
+ 2011-02-09  Julien Danjou  <julien@danjou.info>
+ 
+       * message.el (message-options): Make message-options really buffer
+       local.
+ 
 +2011-02-08  Teodor Zlatanov  <tzz@lifelogs.com>
 +
 +      * mail-source.el: Autoload `auth-source-search'.
 +      (mail-source-keyword-map): Note order matters.
 +      (mail-source-set-1): Get all the mail-source source values and
 +      defaults and search auth-source on those if needed.  This can all
 +      probably be simplified.
 +
 +      * nnimap.el: Autoload `auth-source-search'.
 +      (nnimap-credentials): Use it.
 +      (nnimap-open-connection-1): Ask for the virtual server and physical
 +      address in one shot.
 +
 +      * nntp.el: Autoload `auth-source-search'.
 +      (nntp-send-authinfo): Use it.  Note TODO.
 +
  2011-02-08  Julien Danjou  <julien@danjou.info>
  
+       * shr.el (shr-tag-body): Add support for text attribute in body
+       markups.
+ 
        * message.el (message-options): Make message-options a local variable.
  
 +2011-02-07  Teodor Zlatanov  <tzz@lifelogs.com>
 +
 +      * auth-source.el (auth-source-secrets-search)
 +      (auth-source-user-or-password): Use `append' instead of `nconc'.
 +      (auth-source-user-or-password): Build return list better and protect
 +      against nil :secret.
 +
  2011-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * nnimap.el (nnimap-update-info): Refactor slightly.

diff --cc lisp/nntp.el
Simple merge