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

Trivial merge