Merge branch '2014.11' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 12 Dec 2014 09:25:43 +0000 (10:25 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 12 Dec 2014 09:25:43 +0000 (10:25 +0100)

Trivial merge