Merge branch 'master' of http://git.gnus.org/gnus into SYgnus

author Steve Youngs <steve@sxemacs.org>

Sat, 2 Jan 2016 09:32:35 +0000 (19:32 +1000)

committer Steve Youngs <steve@sxemacs.org>

Sat, 2 Jan 2016 09:32:35 +0000 (19:32 +1000)
author Steve Youngs <steve@sxemacs.org>
Sat, 2 Jan 2016 09:32:35 +0000 (19:32 +1000)
committer Steve Youngs <steve@sxemacs.org>
Sat, 2 Jan 2016 09:32:35 +0000 (19:32 +1000)
diff --cc lisp/dgnushack.el
Simple merge
diff --cc lisp/gnus-start.el
Simple merge
author	Steve Youngs <steve@sxemacs.org>
	Sat, 2 Jan 2016 09:32:35 +0000 (19:32 +1000)
committer	Steve Youngs <steve@sxemacs.org>
	Sat, 2 Jan 2016 09:32:35 +0000 (19:32 +1000)
		1	2
lisp/dgnushack.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/gnus-start.el	patch \|	diff1 \|	diff2 \|	blob \| history