Merge branch 'PHP-7.0' into PHP-7.1

author Andrea Faulds <ajf@ajf.me>

Sun, 5 Feb 2017 01:31:42 +0000 (01:31 +0000)

committer Andrea Faulds <ajf@ajf.me>

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