Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite
authorTed Zlatanov <tzz@lifelogs.com>
Sat, 12 Feb 2011 12:45:50 +0000 (06:45 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Sat, 12 Feb 2011 12:45:50 +0000 (06:45 -0600)
commit2e087cb0e6a334fd151911b19ed234b88fb292fd
treec5efad1bff66043ce1e69ed4786e7d5aaf1c8784
parentc4a74ee2bc07fff6cf78e75778c2e8e3f64e2207
parent4cc72fadbbab87bbdf01d9a0131222ab8c5680df
Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite

Conflicts:
lisp/ChangeLog
lisp/ChangeLog