Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:14:37 +0000 (12:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:14:37 +0000 (12:14 +0200)

Trivial merge