]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 4 Feb 2016 10:45:34 +0000 (11:45 +0100)
committerNikita Popov <nikic@php.net>
Thu, 4 Feb 2016 10:45:34 +0000 (11:45 +0100)

Trivial merge