Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:39:51 +0000 (13:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:39:51 +0000 (13:39 +0200)
commite407242fa96e513599ab568c8822f8bf1f87541e
treef84634dd97f0e463e74de3bd51969a940d950c5c
parentc2f2e792fe2187941bb1117b7b716aa1cae8572d
parent5c0e21957bb7476a568a4bf418d116b51e148079
Merge branch '2016.11' into 2016.11-develop