From: Anatol Belski Date: Tue, 28 Apr 2015 12:39:30 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~133 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac275f9e31379b058050a0139ec9b4dea8ea0013;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix VC9 build with PCRE Revert "Fix segfault in ext/date since 957aa2" Revert "Fix segfault in ext/date since 957aa2" --- ac275f9e31379b058050a0139ec9b4dea8ea0013