]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Tue, 27 Oct 2015 12:33:05 +0000 (13:33 +0100)
committerAndrey Hristov <andrey@php.net>
Tue, 27 Oct 2015 12:33:05 +0000 (13:33 +0100)

Trivial merge