]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAndrey Hristov <andrey@php.net>
Fri, 25 Sep 2015 12:29:56 +0000 (14:29 +0200)
committerAndrey Hristov <andrey@php.net>
Fri, 25 Sep 2015 12:29:56 +0000 (14:29 +0200)

Trivial merge