Merge branch 'PHP-7.0' into PHP-7.1

author Joe Watkins <krakjoe@php.net>

Wed, 18 Jan 2017 18:23:30 +0000 (18:23 +0000)

committer Joe Watkins <krakjoe@php.net>

Wed, 18 Jan 2017 18:23:59 +0000 (18:23 +0000)
author Joe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 18:23:30 +0000 (18:23 +0000)
committer Joe Watkins <krakjoe@php.net>
Wed, 18 Jan 2017 18:23:59 +0000 (18:23 +0000)
diff --cc NEWS
Simple merge
diff --cc ext/mysqli/mysqli.c
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Wed, 18 Jan 2017 18:23:30 +0000 (18:23 +0000)
committer	Joe Watkins <krakjoe@php.net>
	Wed, 18 Jan 2017 18:23:59 +0000 (18:23 +0000)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli.c	patch \|	diff1 \|	diff2 \|	blob \| history