]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Sat, 18 Apr 2015 08:00:24 +0000 (10:00 +0200)
committerRemi Collet <remi@php.net>
Sat, 18 Apr 2015 08:00:24 +0000 (10:00 +0200)
* PHP-5.6:
  relax tests with huge year (new zic)


Trivial merge