Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Mon, 11 Oct 2010 18:00:34 +0000 (20:00 +0200)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Mon, 11 Oct 2010 18:00:34 +0000 (20:00 +0200)
commit6e24daa3ae44541c5cc686ff857212cc9a70b4cb
tree840c9f45b85b9e070fd26d9f2a31305819fbffa4
parent7bce91858ee6fb373f48aebbfff6bf508f8dbbe8
parent357954767131102c97574658345a0746daac23a3
Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
lisp/ChangeLog
lisp/ChangeLog