]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Tue, 6 Oct 2015 20:58:11 +0000 (22:58 +0200)
committerNikita Popov <nikic@php.net>
Tue, 6 Oct 2015 20:58:11 +0000 (22:58 +0200)

Trivial merge