Merge branch 'PHP-7.2'

author Anatol Belski <ab@php.net>

Sun, 20 May 2018 11:33:46 +0000 (13:33 +0200)

committer Anatol Belski <ab@php.net>

Sun, 20 May 2018 11:33:46 +0000 (13:33 +0200)
author Anatol Belski <ab@php.net>
Sun, 20 May 2018 11:33:46 +0000 (13:33 +0200)
committer Anatol Belski <ab@php.net>
Sun, 20 May 2018 11:33:46 +0000 (13:33 +0200)
diff --cc Zend/zend_API.c
Simple merge
diff --cc ext/zend_test/test.c
Simple merge
author	Anatol Belski <ab@php.net>
	Sun, 20 May 2018 11:33:46 +0000 (13:33 +0200)
committer	Anatol Belski <ab@php.net>
	Sun, 20 May 2018 11:33:46 +0000 (13:33 +0200)
		1	2
Zend/zend_API.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/zend_test/test.c	patch \|	diff1 \|	diff2 \|	blob \| history