Merge branch 'PHP-7.2' into PHP-7.3

author Anatol Belski <ab@php.net>

Thu, 13 Sep 2018 09:06:47 +0000 (11:06 +0200)

committer Anatol Belski <ab@php.net>

Thu, 13 Sep 2018 09:06:47 +0000 (11:06 +0200)
author Anatol Belski <ab@php.net>
Thu, 13 Sep 2018 09:06:47 +0000 (11:06 +0200)
committer Anatol Belski <ab@php.net>
Thu, 13 Sep 2018 09:06:47 +0000 (11:06 +0200)
diff --cc appveyor/build_task.bat
Simple merge
diff --cc ext/openssl/tests/openssl_error_string_basic.phpt
Simple merge
author	Anatol Belski <ab@php.net>
	Thu, 13 Sep 2018 09:06:47 +0000 (11:06 +0200)
committer	Anatol Belski <ab@php.net>
	Thu, 13 Sep 2018 09:06:47 +0000 (11:06 +0200)
		1	2
appveyor/build_task.bat	patch \|	diff1 \|	diff2 \|	blob \| history
ext/openssl/tests/openssl_error_string_basic.phpt	patch \|	diff1 \|	diff2 \|	blob \| history