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

Trivial merge