]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sun, 4 Dec 2016 21:45:31 +0000 (22:45 +0100)
committerAnatol Belski <ab@php.net>
Sun, 4 Dec 2016 21:45:31 +0000 (22:45 +0100)
* PHP-7.0:
  fix test


Trivial merge