]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 18 Aug 2016 13:36:07 +0000 (15:36 +0200)
committerAnatol Belski <ab@php.net>
Thu, 18 Aug 2016 13:36:07 +0000 (15:36 +0200)
* PHP-7.0:
  fix test


Trivial merge