Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:35:47 +0000 (13:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:35:47 +0000 (13:35 +0200)
commit747fe660cec255ea42a895c767b9f8c4806e8270
treec7de35da4c82f68cea00ba2d48abb09542eee4eb
parentf52c48422322d4047b62aa2a22b40b02dd3471cc
parent1f6ad90ce902d95b11efcf82301e2bcd5e1d22c5
Merge branch '2015.11-develop' into 2016.11

Change-Id: I1d01234788761638587e2629ff57385789203afd