]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Fri, 9 Sep 2016 14:30:26 +0000 (16:30 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Fri, 9 Sep 2016 14:30:26 +0000 (16:30 +0200)

Trivial merge