]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Sat, 23 Jul 2016 19:03:45 +0000 (21:03 +0200)
committerAnatol Belski <ab@php.net>
Sat, 23 Jul 2016 19:03:45 +0000 (21:03 +0200)
* PHP-5.6:
  fix test


Trivial merge