Merge branch '2016.11-develop-setup' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Jul 2017 16:36:48 +0000 (18:36 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Jul 2017 16:36:48 +0000 (18:36 +0200)
commit50b2a11d02390ea7175c4780f418f0e0b5e7d4c4
tree043bc888100e1439b0ba9c92a3d34b5d5c9d1ec2
parentc6bc6f2bb9562ab7cf1850f7a34255a8662e51a0
parent8072799e441d75b64211cbfa0bf12533d963fe41
Merge branch '2016.11-develop-setup' into 2016.11-develop