]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 5 May 2015 09:23:13 +0000 (11:23 +0200)
committerRemi Collet <remi@php.net>
Tue, 5 May 2015 09:23:13 +0000 (11:23 +0200)
* PHP-5.5:
  Relax tests failing on i386 with new zic


Trivial merge