]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
authorNuno Lopes <nlopess@php.net>
Wed, 30 Nov 2016 19:41:26 +0000 (14:41 -0500)
committerNuno Lopes <nlopess@php.net>
Wed, 30 Nov 2016 19:41:26 +0000 (14:41 -0500)

Trivial merge