Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite
authorTed Zlatanov <tzz@lifelogs.com>
Tue, 8 Feb 2011 20:09:36 +0000 (14:09 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Tue, 8 Feb 2011 20:09:36 +0000 (14:09 -0600)
commitd79ddad8e47423c8c5acf5c7bfa95476cd89dfbe
tree3b8647c237293783cb55372333d567e2df70d598
parentf2f89859da2e61b351f8c39aa6c7ebad60e8e3bd
parent2407f9c65bd0148548e749d66414ce2f79300751
Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite

Conflicts:
lisp/ChangeLog
lisp/ChangeLog