]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Wed, 23 Sep 2015 16:40:28 +0000 (18:40 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 23 Sep 2015 16:40:28 +0000 (18:40 +0200)

Trivial merge