Merge branch 'pull-request/2124'

author Joe Watkins <krakjoe@php.net>

Fri, 6 Jan 2017 08:13:53 +0000 (08:13 +0000)

committer Joe Watkins <krakjoe@php.net>

Fri, 6 Jan 2017 08:13:53 +0000 (08:13 +0000)
author Joe Watkins <krakjoe@php.net>
Fri, 6 Jan 2017 08:13:53 +0000 (08:13 +0000)
committer Joe Watkins <krakjoe@php.net>
Fri, 6 Jan 2017 08:13:53 +0000 (08:13 +0000)
diff --cc acinclude.m4
Simple merge
diff --cc configure.in
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Fri, 6 Jan 2017 08:13:53 +0000 (08:13 +0000)
committer	Joe Watkins <krakjoe@php.net>
	Fri, 6 Jan 2017 08:13:53 +0000 (08:13 +0000)
		1	2
acinclude.m4	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history