Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:51:23 +0000 (13:51 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:51:23 +0000 (13:51 +0200)

Trivial merge