]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Mon, 2 May 2016 09:58:31 +0000 (11:58 +0200)
committerNikita Popov <nikic@php.net>
Mon, 2 May 2016 09:58:31 +0000 (11:58 +0200)

Trivial merge