Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Tue, 9 Nov 2010 18:03:39 +0000 (19:03 +0100)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Tue, 9 Nov 2010 18:03:39 +0000 (19:03 +0100)
Conflicts:
lisp/ChangeLog


Trivial merge