Merge branch 'PHP-7.3' into PHP-7.4

author Christoph M. Becker <cmbecker69@gmx.de>

Mon, 23 Mar 2020 13:13:24 +0000 (14:13 +0100)

committer Christoph M. Becker <cmbecker69@gmx.de>

Mon, 23 Mar 2020 13:13:42 +0000 (14:13 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Mon, 23 Mar 2020 13:13:24 +0000 (14:13 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Mon, 23 Mar 2020 13:13:42 +0000 (14:13 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/iconv/iconv.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 23 Mar 2020 13:13:24 +0000 (14:13 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 23 Mar 2020 13:13:42 +0000 (14:13 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/iconv/iconv.c	patch \|	diff1 \|	diff2 \|	blob \| history