Merge branch 'PHP-7.1'

author Andrea Faulds <ajf@ajf.me>

Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)

committer Andrea Faulds <ajf@ajf.me>

Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)
author Andrea Faulds <ajf@ajf.me>
Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)
committer Andrea Faulds <ajf@ajf.me>
Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)
diff --cc Zend/configure.ac
Simple merge
diff --cc configure.ac
Simple merge
author	Andrea Faulds <ajf@ajf.me>
	Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)
committer	Andrea Faulds <ajf@ajf.me>
	Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)
		1	2
Zend/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history