]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 17 Aug 2016 16:13:41 +0000 (18:13 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 17 Aug 2016 16:13:41 +0000 (18:13 +0200)

Trivial merge