Merge branch 'master' of https://git.gnus.org/gnus
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 6 Dec 2010 03:55:24 +0000 (03:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 6 Dec 2010 03:55:24 +0000 (03:55 +0000)
commit98e05c140c0c663647a55f1e9409c626e0a6bec0
treec7f8f5bd44b429588695e0cec42c16af72755b20
parent1ad567aa1c0bf7590d82f455f11d3e4a720d91c4
parentc4ec1d88972a1f69fd552518d46eb108e3b5987a
Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
lisp/ChangeLog
lisp/ChangeLog