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

Trivial merge