]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Wed, 21 Oct 2015 14:15:45 +0000 (16:15 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 21 Oct 2015 14:15:45 +0000 (16:15 +0200)

Trivial merge