]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Sat, 13 Aug 2016 09:47:20 +0000 (11:47 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sat, 13 Aug 2016 09:47:20 +0000 (11:47 +0200)

Trivial merge