]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Tue, 5 Jul 2016 14:57:32 +0000 (16:57 +0200)
committerNikita Popov <nikic@php.net>
Tue, 5 Jul 2016 14:57:32 +0000 (16:57 +0200)

Trivial merge