]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Wed, 6 Jul 2016 23:31:49 +0000 (01:31 +0200)
committerNikita Popov <nikic@php.net>
Wed, 6 Jul 2016 23:31:49 +0000 (01:31 +0200)

Trivial merge