]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
authorAnatol Belski <ab@php.net>
Sun, 1 May 2016 11:23:35 +0000 (13:23 +0200)
committerAnatol Belski <ab@php.net>
Sun, 1 May 2016 11:23:35 +0000 (13:23 +0200)

Trivial merge