]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAdam Harvey <aharvey@php.net>
Thu, 24 Sep 2015 12:20:07 +0000 (14:20 +0200)
committerAdam Harvey <aharvey@php.net>
Thu, 24 Sep 2015 12:20:07 +0000 (14:20 +0200)

Trivial merge