Merge branch 'PHP-7.0' into PHP-7.1

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

Sun, 13 Aug 2017 18:53:32 +0000 (20:53 +0200)

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

Sun, 13 Aug 2017 19:03:45 +0000 (21:03 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Sun, 13 Aug 2017 18:53:32 +0000 (20:53 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Sun, 13 Aug 2017 19:03:45 +0000 (21:03 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/wddx/wddx.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Sun, 13 Aug 2017 18:53:32 +0000 (20:53 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Sun, 13 Aug 2017 19:03:45 +0000 (21:03 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/wddx/wddx.c	patch \|	diff1 \|	diff2 \|	blob \| history