Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 30 Apr 2015 07:36:49 +0000 (09:36 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 30 Apr 2015 07:36:49 +0000 (09:36 +0200)
commit41d17083b992412b15f72d129ba83bc1e7395e20
treef74a79ce2c21252fbc0dfdfe754b7ad89db40d23
parent8cb6729b2a3f38af0533a9c71563d3271d860795
parentfcf58a5b213eac403f89cefdc819fdc4effc64d5
Merge branch '2014.11-develop' into 2014.09