]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Fri, 16 Oct 2015 15:45:55 +0000 (17:45 +0200)
committerNikita Popov <nikic@php.net>
Fri, 16 Oct 2015 15:45:55 +0000 (17:45 +0200)

Trivial merge