]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Sat, 10 Oct 2015 13:00:58 +0000 (15:00 +0200)
committerNikita Popov <nikic@php.net>
Sat, 10 Oct 2015 13:00:58 +0000 (15:00 +0200)

Trivial merge