]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorChristoph M. Becker <cmb@php.net>
Thu, 16 Jun 2016 12:34:10 +0000 (14:34 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 16 Jun 2016 12:34:10 +0000 (14:34 +0200)

Trivial merge