Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite
authorTed Zlatanov <tzz@lifelogs.com>
Wed, 9 Feb 2011 21:34:12 +0000 (15:34 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Wed, 9 Feb 2011 21:34:12 +0000 (15:34 -0600)
commitbb14e42650df76c01ba8ea09bc341e7abae239ba
tree8b30a959480af4a39db7a2c43291fe96c3b6607c
parent90e4c6ac159c751bb54c5d2053d5f3aa71b78640
parent8eb5f1cde674860ba1a05c8754e45dbadc137ca5
Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite

Conflicts:
lisp/ChangeLog
lisp/ChangeLog
lisp/nntp.el