]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:34:32 +0000 (17:34 +0200)
committerRemi Collet <remi@php.net>
Thu, 5 Jun 2014 15:34:32 +0000 (17:34 +0200)
* PHP-5.5:
  fix test for 5.4/5.5


Trivial merge