]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Tue, 29 Sep 2015 07:49:22 +0000 (09:49 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 29 Sep 2015 07:49:22 +0000 (09:49 +0200)

Trivial merge