From: Remi Collet <remi@php.net>
Date: Tue, 5 May 2015 09:23:13 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.10RC1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac3ca0280a4716000da1bc1777f4dfded3eabdfc;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Relax tests failing on i386 with new zic
---

ac3ca0280a4716000da1bc1777f4dfded3eabdfc