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

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index 1b445f0,19370f2..4e449a1
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,17 -1,7 +1,21 @@@
+ 2011-02-08  Julien Danjou  <julien@danjou.info>
+ 
+       * message.el (message-options): Make message-options a local variable.
+ 
 +2011-02-07  Teodor Zlatanov  <tzlatanov@jumptrading.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-06  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * auth-source.el (top): Require 'eieio unconditionally.  Autoload
 +      `secrets-get-attributes' instead of `secrets-get-attribute'.
 +      (auth-source-secrets-search): Limit search when `max' is greater than
 +      number of results.
 +
  2011-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * nnimap.el (nnimap-update-info): Refactor slightly.