]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorChristoph M. Becker <cmb@php.net>
Thu, 9 Jun 2016 13:45:54 +0000 (15:45 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 9 Jun 2016 13:45:54 +0000 (15:45 +0200)

Trivial merge