From: Derick Rethans Date: Tue, 28 Apr 2015 14:58:30 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~128 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54f016ad77c472ac8b3324e6a414840aaf982850;p=php Merge branch 'PHP-5.6' Conflicts: ext/date/lib/parse_iso_intervals.re ext/date/lib/timelib.h --- 54f016ad77c472ac8b3324e6a414840aaf982850