]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
authorPierre Joye <pierre.php@gmail.com>
Tue, 7 Jun 2016 10:38:41 +0000 (17:38 +0700)
committerPierre Joye <pierre.php@gmail.com>
Tue, 7 Jun 2016 10:38:41 +0000 (17:38 +0700)

Trivial merge