Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 May 2015 12:27:05 +0000 (14:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 May 2015 12:27:05 +0000 (14:27 +0200)
commit08f4ecce97f37408897d59ab31b6b3159408f1b7
treea9e3612569b72fa75a55d9da7ba668b260cb7ce6
parentd6e1e24f25dfad316c3f950af192ff9c48dac8f9
parentdb1b91c830c0244646bc244853bd4d95b9ef17f7
Merge branch '2014.11-develop' into 2014.09