Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:47:09 +0000 (14:47 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:47:09 +0000 (14:47 +0100)
commit6f5d1303d97a777704d0b87cdf36df5a11e4c179
treef4c4ea2c84a8fa64006cdde7d588d662ef0b6424
parent2b86808385641bc06f1014e010e7b74a6f691087
parent48ccdb7a3f47732a27d4af379e33f873ed91e8b9
Merge branch '2015.11' into 2015.11-develop