]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Fri, 11 Dec 2015 15:06:28 +0000 (16:06 +0100)
committerNikita Popov <nikic@php.net>
Fri, 11 Dec 2015 15:06:28 +0000 (16:06 +0100)

Trivial merge