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

Trivial merge