Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 8 Dec 2010 19:34:48 +0000 (20:34 +0100)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 8 Dec 2010 19:34:48 +0000 (20:34 +0100)
Conflicts:
lisp/ChangeLog


Trivial merge