]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 21 Jun 2016 14:22:51 +0000 (16:22 +0200)
committerAnatol Belski <ab@php.net>
Tue, 21 Jun 2016 14:22:51 +0000 (16:22 +0200)
* PHP-5.6:
  fix test


Trivial merge