Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:09 +0000 (15:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Mar 2016 14:06:09 +0000 (15:06 +0100)

Trivial merge