Merge branch 'PHP-7.4'

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

Fri, 1 Mar 2019 15:14:20 +0000 (16:14 +0100)

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

Fri, 1 Mar 2019 15:14:20 +0000 (16:14 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Fri, 1 Mar 2019 15:14:20 +0000 (16:14 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Fri, 1 Mar 2019 15:14:20 +0000 (16:14 +0100)
diff --cc Zend/zend_compile.h
Simple merge
diff --cc Zend/zend_execute.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 1 Mar 2019 15:14:20 +0000 (16:14 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 1 Mar 2019 15:14:20 +0000 (16:14 +0100)
		1	2
Zend/zend_compile.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_execute.c	patch \|	diff1 \|	diff2 \|	blob \| history