Merge branch 'PHP-7.3' into PHP-7.4

author Stanislav Malyshev <stas@php.net>

Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)

committer Stanislav Malyshev <stas@php.net>

Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)
author Stanislav Malyshev <stas@php.net>
Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)
committer Stanislav Malyshev <stas@php.net>
Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)
diff --cc ext/gd/libgd/gd_xbm.c
Simple merge
diff --cc ext/iconv/iconv.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)
committer	Stanislav Malyshev <stas@php.net>
	Mon, 27 May 2019 23:49:31 +0000 (16:49 -0700)
		1	2
ext/gd/libgd/gd_xbm.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/iconv/iconv.c	patch \|	diff1 \|	diff2 \|	blob \| history