]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Fri, 9 Oct 2015 21:30:34 +0000 (23:30 +0200)
committerNikita Popov <nikic@php.net>
Fri, 9 Oct 2015 21:30:34 +0000 (23:30 +0200)

Trivial merge