Merge branch 'PHP-7.1' into PHP-7.2

author Christoph M. Becker <cmbecker69@gmx.de>

Wed, 22 Aug 2018 10:52:11 +0000 (12:52 +0200)

committer Christoph M. Becker <cmbecker69@gmx.de>

Wed, 22 Aug 2018 10:52:41 +0000 (12:52 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Wed, 22 Aug 2018 10:52:11 +0000 (12:52 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Wed, 22 Aug 2018 10:52:41 +0000 (12:52 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/libxml/libxml.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Wed, 22 Aug 2018 10:52:11 +0000 (12:52 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Wed, 22 Aug 2018 10:52:41 +0000 (12:52 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/libxml/libxml.c	patch \|	diff1 \|	diff2 \|	blob \| history