]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Tue, 12 Jan 2016 15:48:44 +0000 (16:48 +0100)
committerNikita Popov <nikic@php.net>
Tue, 12 Jan 2016 15:48:44 +0000 (16:48 +0100)

Trivial merge