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)
commitab30bb925c089597a78a2c21e3b0e0009042b252
treedb71a64b61e50cbab9e169f8bc846050c85f770f
parentbc65f742e65db892dd71f3ce37dc69154230a99a
parentbac5c4dfbabbc639ba9090d019bd9d9aa1a7ad27
Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
lisp/ChangeLog