Merge remote-tracking branch 'origin/no-gnus'
authorLars Ingebrigtsen <larsi@gnus.org>
Tue, 31 Jan 2012 22:58:58 +0000 (23:58 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 31 Jan 2012 22:58:58 +0000 (23:58 +0100)

Trivial merge