From: Remi Collet Date: Tue, 5 May 2015 09:37:03 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~93^2~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d754be166e78a41e1a258c97c43e3d100d41704a;p=php Merge branch 'PHP-5.6' * PHP-5.6: Relax tests failing on i386 with new zic Conflicts: ext/date/tests/getdate_variation7.phpt ext/date/tests/localtime_variation3.phpt --- d754be166e78a41e1a258c97c43e3d100d41704a