]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Wed, 9 Mar 2016 22:01:51 +0000 (23:01 +0100)
committerNikita Popov <nikic@php.net>
Wed, 9 Mar 2016 22:01:51 +0000 (23:01 +0100)

Trivial merge