]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Wed, 20 Apr 2016 17:00:13 +0000 (19:00 +0200)
committerNikita Popov <nikic@php.net>
Wed, 20 Apr 2016 17:00:13 +0000 (19:00 +0200)

Trivial merge