]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 01:18:19 +0000 (03:18 +0200)
committerAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 01:18:19 +0000 (03:18 +0200)
* PHP-7.0:
  fix test run with autogenerated ini


Trivial merge