]> 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>
Wed, 8 Jun 2016 04:08:05 +0000 (11:08 +0700)
committerPierre Joye <pierre.php@gmail.com>
Wed, 8 Jun 2016 04:08:05 +0000 (11:08 +0700)

Trivial merge