Merge branch 'PHP-7.0' into PHP-7.1

author Joe Watkins <krakjoe@php.net>

Fri, 3 Feb 2017 06:12:20 +0000 (06:12 +0000)

committer Joe Watkins <krakjoe@php.net>

Fri, 3 Feb 2017 06:12:42 +0000 (06:12 +0000)
author Joe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:12:20 +0000 (06:12 +0000)
committer Joe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 06:12:42 +0000 (06:12 +0000)
diff --cc NEWS
Simple merge
diff --cc ext/dom/document.c
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Fri, 3 Feb 2017 06:12:20 +0000 (06:12 +0000)
committer	Joe Watkins <krakjoe@php.net>
	Fri, 3 Feb 2017 06:12:42 +0000 (06:12 +0000)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/dom/document.c	patch \|	diff1 \|	diff2 \|	blob \| history