Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 18 Nov 2016 16:35:10 +0000 (17:35 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 18 Nov 2016 16:35:10 +0000 (17:35 +0100)
commit91f2a3e608e37e1b6f5afbc54f3b88a544b7bd19
treec4498b582c7ebff76d8a2bd6785710b4d606e859
parent43d86f033b70776f7fbb53a5b67395d85e9e6782
parent54ec4c888466364e3a05da72e3fb1ebd361a93a7
Merge branch '2015.11-develop' into 2016.11