Merge branch 'PHP-7.0' into PHP-7.1

author Joe Watkins <krakjoe@php.net>

Mon, 17 Apr 2017 07:09:05 +0000 (08:09 +0100)

committer Joe Watkins <krakjoe@php.net>

Mon, 17 Apr 2017 07:09:24 +0000 (08:09 +0100)
author Joe Watkins <krakjoe@php.net>
Mon, 17 Apr 2017 07:09:05 +0000 (08:09 +0100)
committer Joe Watkins <krakjoe@php.net>
Mon, 17 Apr 2017 07:09:24 +0000 (08:09 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/date/php_date.c
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Mon, 17 Apr 2017 07:09:05 +0000 (08:09 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Mon, 17 Apr 2017 07:09:24 +0000 (08:09 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/date/php_date.c	patch \|	diff1 \|	diff2 \|	blob \| history