Merge branch 'PHP-7.3' into PHP-7.4

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

Thu, 6 Aug 2020 10:03:57 +0000 (12:03 +0200)

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

Thu, 6 Aug 2020 10:03:57 +0000 (12:03 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Thu, 6 Aug 2020 10:03:57 +0000 (12:03 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Thu, 6 Aug 2020 10:03:57 +0000 (12:03 +0200)
diff --cc NEWS
Simple merge
diff --cc Zend/zend_language_scanner.l
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 6 Aug 2020 10:03:57 +0000 (12:03 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 6 Aug 2020 10:03:57 +0000 (12:03 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_language_scanner.l	patch \|	diff1 \|	diff2 \|	blob \| history