]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 16:30:05 +0000 (17:30 +0100)
committerNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 16:30:05 +0000 (17:30 +0100)

Trivial merge