Merge branch 'master' of https://git.gnus.org/gnus
authorLars Ingebrigtsen <larsi@gnus.org>
Wed, 26 Dec 2012 17:10:23 +0000 (18:10 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Wed, 26 Dec 2012 17:10:23 +0000 (18:10 +0100)

Trivial merge