Merge branch 'PHP-5.5' into PHP-5.6

author Stanislav Malyshev <stas@php.net>

Tue, 1 Sep 2015 19:51:48 +0000 (12:51 -0700)

committer Stanislav Malyshev <stas@php.net>

Tue, 1 Sep 2015 19:51:48 +0000 (12:51 -0700)
author Stanislav Malyshev <stas@php.net>
Tue, 1 Sep 2015 19:51:48 +0000 (12:51 -0700)
committer Stanislav Malyshev <stas@php.net>
Tue, 1 Sep 2015 19:51:48 +0000 (12:51 -0700)
diff --cc ext/pcre/php_pcre.c
Simple merge
diff --cc ext/session/session.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Tue, 1 Sep 2015 19:51:48 +0000 (12:51 -0700)
committer	Stanislav Malyshev <stas@php.net>
	Tue, 1 Sep 2015 19:51:48 +0000 (12:51 -0700)
		1	2
ext/pcre/php_pcre.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/session/session.c	patch \|	diff1 \|	diff2 \|	blob \| history