Merge branch 'PHP-5.6'

author Stanislav Malyshev <stas@php.net>

Mon, 28 Jul 2014 07:39:24 +0000 (00:39 -0700)

committer Stanislav Malyshev <stas@php.net>

Mon, 28 Jul 2014 07:39:24 +0000 (00:39 -0700)
author Stanislav Malyshev <stas@php.net>
Mon, 28 Jul 2014 07:39:24 +0000 (00:39 -0700)
committer Stanislav Malyshev <stas@php.net>
Mon, 28 Jul 2014 07:39:24 +0000 (00:39 -0700)
diff --cc ext/openssl/openssl.c
Simple merge
diff --cc ext/session/session.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Mon, 28 Jul 2014 07:39:24 +0000 (00:39 -0700)
committer	Stanislav Malyshev <stas@php.net>
	Mon, 28 Jul 2014 07:39:24 +0000 (00:39 -0700)
		1	2
ext/openssl/openssl.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/session/session.c	patch \|	diff1 \|	diff2 \|	blob \| history