Merge branch 'openssl_drop_ssl2'

author Jakub Zelenka <bukka@php.net>

Sun, 17 Jul 2016 16:14:38 +0000 (17:14 +0100)

committer Jakub Zelenka <bukka@php.net>

Sun, 17 Jul 2016 16:14:38 +0000 (17:14 +0100)
author Jakub Zelenka <bukka@php.net>
Sun, 17 Jul 2016 16:14:38 +0000 (17:14 +0100)
committer Jakub Zelenka <bukka@php.net>
Sun, 17 Jul 2016 16:14:38 +0000 (17:14 +0100)
diff --cc NEWS
Simple merge
diff --cc UPGRADING
Simple merge
author	Jakub Zelenka <bukka@php.net>
	Sun, 17 Jul 2016 16:14:38 +0000 (17:14 +0100)
committer	Jakub Zelenka <bukka@php.net>
	Sun, 17 Jul 2016 16:14:38 +0000 (17:14 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
UPGRADING	patch \|	diff1 \|	diff2 \|	blob \| history