Merge branch 'PHP-5.5' into PHP-5.6

author Anatol Belski <ab@php.net>

Thu, 12 Dec 2013 09:46:21 +0000 (10:46 +0100)

committer Anatol Belski <ab@php.net>

Thu, 12 Dec 2013 09:46:21 +0000 (10:46 +0100)
author Anatol Belski <ab@php.net>
Thu, 12 Dec 2013 09:46:21 +0000 (10:46 +0100)
committer Anatol Belski <ab@php.net>
Thu, 12 Dec 2013 09:46:21 +0000 (10:46 +0100)
diff --cc ext/openssl/xp_ssl.c
Simple merge
diff --cc main/streams/xp_socket.c
Simple merge
author	Anatol Belski <ab@php.net>
	Thu, 12 Dec 2013 09:46:21 +0000 (10:46 +0100)
committer	Anatol Belski <ab@php.net>
	Thu, 12 Dec 2013 09:46:21 +0000 (10:46 +0100)
		1	2
ext/openssl/xp_ssl.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/streams/xp_socket.c	patch \|	diff1 \|	diff2 \|	blob \| history