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

Trivial merge