Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Apr 2015 15:38:15 +0000 (17:38 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Apr 2015 15:38:15 +0000 (17:38 +0200)
commit8cb6729b2a3f38af0533a9c71563d3271d860795
tree08b664aa6416f80c32c78d21312eb268721fd4bf
parentcf4a3005159c527c406f52e4e2a6cb57a797b11e
parent3c9d6a29b71c1842d44f4247f66121c26863c9c0
Merge branch '2014.11-develop' into 2014.09