Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Sun, 21 Apr 2019 13:53:44 +0000 (15:53 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Sun, 21 Apr 2019 13:53:44 +0000 (15:53 +0200)
author Peter Kokot <peterkokot@gmail.com>
Sun, 21 Apr 2019 13:53:44 +0000 (15:53 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Sun, 21 Apr 2019 13:53:44 +0000 (15:53 +0200)
diff --cc Zend/Zend.m4
Simple merge
diff --cc configure.ac
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Sun, 21 Apr 2019 13:53:44 +0000 (15:53 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Sun, 21 Apr 2019 13:53:44 +0000 (15:53 +0200)
		1	2
Zend/Zend.m4	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history