Merge branch 'master' of https://git.gnus.org/gnus
authorTed Zlatanov <tzz@lifelogs.com>
Sun, 6 Mar 2011 01:00:40 +0000 (19:00 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Sun, 6 Mar 2011 01:00:40 +0000 (19:00 -0600)

Trivial merge