Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 17 Nov 2010 17:10:16 +0000 (18:10 +0100)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Wed, 17 Nov 2010 17:10:16 +0000 (18:10 +0100)
commitf66f5a42f19df8899d32ad3abb9ea3c755849584
tree928f0b6f055c0a36ffad4f73a0b1d4690d9e5e07
parented1aaf38114d4843519317a3e98b9c600c76d9bf
parent8b8e1741311ab34fea732c86ee5b2dc5c5110c32
Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
lisp/ChangeLog
lisp/ChangeLog