Merge branch 'PHP-5.6' into PHP-7.0

author Nikita Popov <nikic@php.net>

Sun, 7 Aug 2016 16:38:28 +0000 (18:38 +0200)

committer Nikita Popov <nikic@php.net>

Sun, 7 Aug 2016 16:38:28 +0000 (18:38 +0200)
author Nikita Popov <nikic@php.net>
Sun, 7 Aug 2016 16:38:28 +0000 (18:38 +0200)
committer Nikita Popov <nikic@php.net>
Sun, 7 Aug 2016 16:38:28 +0000 (18:38 +0200)
diff --cc ext/standard/tests/streams/stream_socket_enable_crypto.phpt
Simple merge
author	Nikita Popov <nikic@php.net>
	Sun, 7 Aug 2016 16:38:28 +0000 (18:38 +0200)
committer	Nikita Popov <nikic@php.net>
	Sun, 7 Aug 2016 16:38:28 +0000 (18:38 +0200)