Merge branch 'PHP-7.0' into PHP-7.1

author Jakub Zelenka <bukka@php.net>

Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)

committer Jakub Zelenka <bukka@php.net>

Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)
author Jakub Zelenka <bukka@php.net>
Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)
committer Jakub Zelenka <bukka@php.net>
Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)
diff --cc NEWS
Simple merge
diff --cc ext/openssl/xp_ssl.c
Simple merge
author	Jakub Zelenka <bukka@php.net>
	Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)
committer	Jakub Zelenka <bukka@php.net>
	Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/openssl/xp_ssl.c	patch \|	diff1 \|	diff2 \|	blob \| history