Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Dec 2016 09:35:46 +0000 (10:35 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Dec 2016 09:35:46 +0000 (10:35 +0100)
commit73775f6f2f1eaea41973c8facca01516a80a6d86
treee10000ada365c3428cebd4ae2ee41fbf697ef088
parenta2e53e9daa4510694bef25205fa5f55f7a7fcc88
parent2b42bb829c56095ca6b77863a0c5af0eb04063bc
Merge branch '2015.11-develop' into 2016.11