Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:46:43 +0000 (16:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:46:43 +0000 (16:46 +0100)
commitd58c62ed0301c6c0fbeaffeaa311330305aa8375
treedf3822eb960576709d01e3509c6a80c89684fc89
parent37887e080b9d52252cc95ee8773556b830ad8db3
parent234c8643fadb40167d16198b91dfc9383ab36760
Merge branch '2015.11-develop' into 2016.11