Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 16:26:11 +0000 (18:26 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 16:26:11 +0000 (18:26 +0200)
commit1783cf7a8235c2db94bb4856ed5e7201325751dc
treeeef9867ac242e06e8ea4a6cec2da521381dee7a2
parentc2b58d3808fefc4588de1b9d24ce925e62b0511a
parentefe268c55e00b6b1aed158accf02dbddfaac79ab
Merge branch '2015.11' into 2015.11-develop