From: Derick Rethans Date: Tue, 28 Apr 2015 23:10:40 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~122 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f179852f838c1d88cb39097b9557b7d2ba8e5755;p=php Merge branch 'PHP-5.6' Conflicts: ext/date/lib/parse_tz.c --- f179852f838c1d88cb39097b9557b7d2ba8e5755