Merge branch 'PHP-7.0' into PHP-7.1

author Joe Watkins <krakjoe@php.net>

Mon, 9 Jan 2017 05:32:22 +0000 (05:32 +0000)

committer Joe Watkins <krakjoe@php.net>

Mon, 9 Jan 2017 05:32:50 +0000 (05:32 +0000)
author Joe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:32:22 +0000 (05:32 +0000)
committer Joe Watkins <krakjoe@php.net>
Mon, 9 Jan 2017 05:32:50 +0000 (05:32 +0000)
diff --cc NEWS
Simple merge
diff --cc ext/standard/string.c
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Mon, 9 Jan 2017 05:32:22 +0000 (05:32 +0000)
committer	Joe Watkins <krakjoe@php.net>
	Mon, 9 Jan 2017 05:32:50 +0000 (05:32 +0000)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/string.c	patch \|	diff1 \|	diff2 \|	blob \| history