Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikita.ppv@gmail.com>

Sun, 25 Jun 2017 18:17:15 +0000 (20:17 +0200)

committer Nikita Popov <nikita.ppv@gmail.com>

Sun, 25 Jun 2017 18:17:26 +0000 (20:17 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Sun, 25 Jun 2017 18:17:15 +0000 (20:17 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Sun, 25 Jun 2017 18:17:26 +0000 (20:17 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/wddx/wddx.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Sun, 25 Jun 2017 18:17:15 +0000 (20:17 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Sun, 25 Jun 2017 18:17:26 +0000 (20:17 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/wddx/wddx.c	patch \|	diff1 \|	diff2 \|	blob \| history