From: Ted Zlatanov <tzz@lifelogs.com>
Date: Tue, 8 Feb 2011 20:09:36 +0000 (-0600)
Subject: Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=d79ddad8e47423c8c5acf5c7bfa95476cd89dfbe;p=gnus

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

Conflicts:
	lisp/ChangeLog
---

d79ddad8e47423c8c5acf5c7bfa95476cd89dfbe
diff --cc lisp/ChangeLog
index 1b445f03a,19370f2ad..4e449a179
--- a/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.