Merge branch 'master' of http://git.gnus.org/gnus into SYgnus
authorSteve Youngs <steve@sxemacs.org>
Tue, 5 Jan 2016 00:00:55 +0000 (10:00 +1000)
committerSteve Youngs <steve@sxemacs.org>
Tue, 5 Jan 2016 00:00:55 +0000 (10:00 +1000)

Trivial merge