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

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index c55fedd,64df411..61dcc31
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -5,17 -5,10 +5,17 @@@
        (auth-source-secrets-search): Limit search when `max' is greater than
        number of results.
  
- 2011-02-06  Teodor Zlatanov  <tzz@lifelogs.com>
- 
-       * auth-source.el (auth-source-secrets-search): Add examples.
- 
 +2011-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * nntp.el (nntp-finish-retrieve-group-infos): Protect against the first
 +      part not returning any data.
 +
 +      * proto-stream.el (open-protocol-stream): Document the return value.
 +
+ 2011-02-06  Teodor Zlatanov  <tzz@lifelogs.com>
+ 
+       * auth-source.el (auth-source-secrets-search): Add examples.
+ 
  2011-02-06  Julien Danjou  <julien@danjou.info>
  
        * message.el (message-setup-1): Handle message-generate-headers-first