]> granicus.if.org Git - php/commit
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)
commitca6f679417308796ae166f9fd2f6cd9a8cf4ccbe
tree1dd864a68c7717e02fb90519deaf0013fe488296
parent19e80ef4963d7371ee25b85f8224ee912efe418e
parent2c7909697a98eb51e3671bc59edc1d7adfa72a0e
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix test