]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 14 Sep 2016 18:02:05 +0000 (20:02 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 14 Sep 2016 18:02:05 +0000 (20:02 +0200)

Trivial merge