]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Wed, 28 Oct 2015 11:56:26 +0000 (12:56 +0100)
committerAndrey Hristov <andrey@php.net>
Wed, 28 Oct 2015 11:56:26 +0000 (12:56 +0100)

Trivial merge