Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite
authorTed Zlatanov <tzz@lifelogs.com>
Mon, 7 Feb 2011 20:35:10 +0000 (14:35 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Mon, 7 Feb 2011 20:35:10 +0000 (14:35 -0600)
commitf2f89859da2e61b351f8c39aa6c7ebad60e8e3bd
tree9c93003642f5c6453dae528246ea67941ed798f9
parent060d648dcb691ba9f4620e320b1cb8409c060fad
parentfb8f2a30fdfc3d563268d94b5bc12faa34d2aa76
Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite

Conflicts:
lisp/ChangeLog
lisp/ChangeLog