]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 23 May 2014 15:23:55 +0000 (15:23 +0000)
committerAdam Harvey <aharvey@php.net>
Fri, 23 May 2014 15:23:55 +0000 (15:23 +0000)
* PHP-5.6:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.


Trivial merge