Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 22 Apr 2016 07:08:11 +0000 (09:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 22 Apr 2016 07:08:11 +0000 (09:08 +0200)

Trivial merge