]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Thu, 22 Oct 2015 10:20:20 +0000 (12:20 +0200)
committerAndrey Hristov <andrey@php.net>
Thu, 22 Oct 2015 10:20:20 +0000 (12:20 +0200)

Trivial merge