]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Thu, 28 Jul 2016 18:00:37 +0000 (20:00 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 28 Jul 2016 18:00:37 +0000 (20:00 +0200)

Trivial merge