Merge branch 'PHP-5.5' into PHP-5.6.18

author Stanislav Malyshev <stas@php.net>

Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)

committer Stanislav Malyshev <stas@php.net>

Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)
author Stanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)
committer Stanislav Malyshev <stas@php.net>
Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)
diff --cc ext/pcre/pcrelib/ChangeLog
Simple merge
diff --cc ext/pcre/pcrelib/doc/pcre.txt
Simple merge
diff --cc ext/pcre/pcrelib/pcre_exec.c
Simple merge
diff --cc ext/pcre/pcrelib/pcre_study.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Tue, 2 Feb 2016 02:32:14 +0000 (18:32 -0800)
		1	2
ext/pcre/pcrelib/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/doc/pcre.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/pcre_exec.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pcre/pcrelib/pcre_study.c	patch \|	diff1 \|	diff2 \|	blob \| history