]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Wed, 7 Oct 2015 14:26:58 +0000 (16:26 +0200)
committerNikita Popov <nikic@php.net>
Wed, 7 Oct 2015 14:26:58 +0000 (16:26 +0200)

Trivial merge