Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 19 Jul 2016 08:57:40 +0000 (01:57 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Jul 2016 08:57:40 +0000 (01:57 -0700)
* 'PHP-7.0' of git.php.net:php-src:


Trivial merge