]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Tue, 1 Mar 2016 23:38:33 +0000 (00:38 +0100)
committerNikita Popov <nikic@php.net>
Tue, 1 Mar 2016 23:38:33 +0000 (00:38 +0100)

Trivial merge