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

Trivial merge