]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 16 Jun 2014 08:52:39 +0000 (10:52 +0200)
committerRemi Collet <remi@php.net>
Mon, 16 Jun 2014 08:52:39 +0000 (10:52 +0200)
* PHP-5.6:
  fix failed test


Trivial merge