Merge branch 'master' of https://git.gnus.org/gnus
authorLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Tue, 9 Nov 2010 18:03:39 +0000 (19:03 +0100)
committerLars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Tue, 9 Nov 2010 18:03:39 +0000 (19:03 +0100)
commit576f700c4b3e7702f2c2f64fdc9298c8bbe8beb3
tree9901b3bd60aa9e0b05e829c23651324c66e16477
parent41e5cd5a00ff85b899e7234a50d7b8cec96b7ff5
parentaa4305fc4b00be3c0d082061224767a999f27dd5
Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
lisp/ChangeLog