From: Stanislav Malyshev Date: Tue, 28 Apr 2015 06:41:18 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~138 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c34aba472c4bf4f92f8fb47df6f6b2126bc86be5;p=php Merge branch 'PHP-5.6' * PHP-5.6: Upgrade PCRE to 8.36, it fixes some crashes Conflicts: ext/pcre/pcrelib/config.h ext/pcre/pcrelib/pcre_ucd.c --- c34aba472c4bf4f92f8fb47df6f6b2126bc86be5