]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 02:42:44 +0000 (18:42 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 02:42:44 +0000 (18:42 -0800)
* PHP-7.0:
  Fix test


Trivial merge