Merge branch 'PHP-8.0'

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

Wed, 25 Nov 2020 10:48:51 +0000 (11:48 +0100)

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

Wed, 25 Nov 2020 10:48:51 +0000 (11:48 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Wed, 25 Nov 2020 10:48:51 +0000 (11:48 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Wed, 25 Nov 2020 10:48:51 +0000 (11:48 +0100)
diff --cc Zend/Zend.m4
Simple merge
diff --cc configure.ac
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 25 Nov 2020 10:48:51 +0000 (11:48 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 25 Nov 2020 10:48:51 +0000 (11:48 +0100)
		1	2
Zend/Zend.m4	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history