Merge branch '2016.11-develop' into 2017.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:40:41 +0000 (13:40 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:40:41 +0000 (13:40 +0200)
commite1107aba28977d45eb6082c1c152dc67df44582e
treefc4029073d6e6fe1ee85f4cbaa65292c003336ff
parented3dac612215e711b9142c888b89d621c583c238
parente407242fa96e513599ab568c8822f8bf1f87541e
Merge branch '2016.11-develop' into 2017.11