]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Fri, 11 Mar 2016 21:45:52 +0000 (22:45 +0100)
committerNikita Popov <nikic@php.net>
Fri, 11 Mar 2016 21:45:52 +0000 (22:45 +0100)

Trivial merge