]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Tue, 12 Jul 2016 13:27:57 +0000 (15:27 +0200)
committerJulien Pauli <jpauli@php.net>
Tue, 12 Jul 2016 13:27:57 +0000 (15:27 +0200)
* PHP-5.6:
  Fix test for #52384


Trivial merge