]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Fri, 25 Mar 2016 19:23:30 +0000 (20:23 +0100)
committerNikita Popov <nikic@php.net>
Fri, 25 Mar 2016 19:23:30 +0000 (20:23 +0100)

Trivial merge