Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 15 Nov 2016 09:51:35 +0000 (10:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 15 Nov 2016 09:51:35 +0000 (10:51 +0100)
commitacbac42eec3ee887bbc9e7beb5674febd764da7d
tree05be20e1636fe8998f30177a30c08713b4ecc921
parentb5bfe3b390ca9f14134b38ca120d5ab09d2804e2
parent38e0e4f1c8727993e1873cf93ef952fd6a02f049
Merge branch '2015.11-develop' into 2016.11