Issue #28538: Merge 3.6.

author Xavier de Gaye <xdegaye@users.sourceforge.net>

Wed, 21 Dec 2016 16:30:50 +0000 (17:30 +0100)

committer Xavier de Gaye <xdegaye@users.sourceforge.net>

Wed, 21 Dec 2016 16:30:50 +0000 (17:30 +0100)
author Xavier de Gaye <xdegaye@users.sourceforge.net>
Wed, 21 Dec 2016 16:30:50 +0000 (17:30 +0100)
committer Xavier de Gaye <xdegaye@users.sourceforge.net>
Wed, 21 Dec 2016 16:30:50 +0000 (17:30 +0100)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Xavier de Gaye <xdegaye@users.sourceforge.net>
	Wed, 21 Dec 2016 16:30:50 +0000 (17:30 +0100)
committer	Xavier de Gaye <xdegaye@users.sourceforge.net>
	Wed, 21 Dec 2016 16:30:50 +0000 (17:30 +0100)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history