]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 20 May 2015 06:30:44 +0000 (08:30 +0200)
committerRemi Collet <remi@php.net>
Wed, 20 May 2015 06:30:44 +0000 (08:30 +0200)
* PHP-5.5:
  fix new test


Trivial merge