Merge branch 'master' of https://git.gnus.org/gnus
authorTed Zlatanov <tzz@lifelogs.com>
Fri, 4 Feb 2011 19:21:58 +0000 (13:21 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Fri, 4 Feb 2011 19:21:58 +0000 (13:21 -0600)
commitc53e620be69a4971be0082fe5ed0c96c467340f6
tree47892ec7a7e5e1601c2702216039f5f036bfe4b0
parent293540b6b900616ad92f22e87874f83ddefa383e
parent0818e4b2112e08b043f47fd3c5e950a2f12f691a
Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
texi/ChangeLog
texi/gnus.texi
texi/ChangeLog