Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:18:35 +0000 (18:18 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:18:35 +0000 (18:18 +0200)

Trivial merge