Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Apr 2015 08:54:14 +0000 (10:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Apr 2015 08:54:14 +0000 (10:54 +0200)
commit437286fdf21c8721b8cfb2ddf24b64a31b85650b
tree0090045134846343f180c9bc35de07d41f82ec86
parent512e714c3740dde0930b35e506ab6951331119b2
parent6ee3275215ae39b301421c693f60a9c7a1911d27
Merge branch '2014.11-develop' into 2014.09