]> 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 14:54:36 +0000 (16:54 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 28 Jul 2016 14:54:36 +0000 (16:54 +0200)

Trivial merge