Merge branch '2015.11-php7' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Apr 2016 15:25:24 +0000 (17:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Apr 2016 15:25:24 +0000 (17:25 +0200)
commit5a55dd8b8fc7736f36cd538c7b136431afb9d3f7
tree5a8d35e8781b8dde50cc299f04fe8f96c4cd994b
parent786885f8355b5dcef0135452d5bd62f727346dc2
parentbfc6fa097b2119aa2267db09c48ee262b564c328
Merge branch '2015.11-php7' into 2015.11