]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 25 Aug 2016 14:22:57 +0000 (16:22 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 25 Aug 2016 14:22:57 +0000 (16:22 +0200)

Trivial merge