]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Thu, 24 Dec 2015 13:44:33 +0000 (14:44 +0100)
committerJulien Pauli <jpauli@php.net>
Thu, 24 Dec 2015 13:44:33 +0000 (14:44 +0100)
* PHP-5.6:
  Fixed test


Trivial merge