Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 17 Aug 2016 20:12:01 +0000 (22:12 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 17 Aug 2016 20:12:01 +0000 (22:12 +0200)
commit9fa00097028037794a7e418489e729a1ffa01958
tree7401284eaf6bcceb27f5a7dcd85df7fbdf8bfd34
parent1bc9ea4f10ddeb4bc56e73a21541e38a7b8ab5a7
parent54293d21cbcd1b3bfee331c7011970e629026523
Merge branch 'PHP-5.6' into PHP-7.0