Merge branch 'PHP-7.4'

author Peter Kokot <peterkokot@gmail.com>

Thu, 18 Jul 2019 10:11:45 +0000 (12:11 +0200)

committer Peter Kokot <peterkokot@gmail.com>

Thu, 18 Jul 2019 10:11:45 +0000 (12:11 +0200)
author Peter Kokot <peterkokot@gmail.com>
Thu, 18 Jul 2019 10:11:45 +0000 (12:11 +0200)
committer Peter Kokot <peterkokot@gmail.com>
Thu, 18 Jul 2019 10:11:45 +0000 (12:11 +0200)
diff --cc build/php.m4
Simple merge
diff --cc configure.ac
Simple merge
author	Peter Kokot <peterkokot@gmail.com>
	Thu, 18 Jul 2019 10:11:45 +0000 (12:11 +0200)
committer	Peter Kokot <peterkokot@gmail.com>
	Thu, 18 Jul 2019 10:11:45 +0000 (12:11 +0200)
		1	2
build/php.m4	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history