Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Jun 2015 12:46:06 +0000 (14:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Jun 2015 12:46:06 +0000 (14:46 +0200)
commit595cd5f9286511d23eea2961a641aa51792fee7d
treeeb3d17f937f872b39d66cc653384baf8d14a47f2
parente22ca70a6ff519b5d3c3c047379f1382f0561f76
parente29a29344d0ce049ac2c911a73f67280f79010a3
Merge branch '2014.11-develop' into 2014.09