Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 30 Apr 2015 07:36:49 +0000 (09:36 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 30 Apr 2015 07:36:49 +0000 (09:36 +0200)

Trivial merge