Merge branch '2017.11' into 2017.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Aug 2017 13:01:07 +0000 (15:01 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Aug 2017 13:01:07 +0000 (15:01 +0200)
commit403a5fdfdc6665e0a5359d6ed2788317124b23e4
treeb13d3abf75a51d8c5539e2d771af45fb88697e3e
parentcc7ee86d0ee31a9beb90fe6f621f0705d88d2f00
parent32b7a46edc37977f4495674e06fcfa336e662c50
Merge branch '2017.11' into 2017.11-develop