]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Mon, 23 Feb 2015 09:35:35 +0000 (10:35 +0100)
committerJulien Pauli <jpauli@php.net>
Mon, 23 Feb 2015 09:35:35 +0000 (10:35 +0100)
* PHP-5.5:
  Fixed test fails for bug68557


Trivial merge