Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 24 Jul 2015 10:09:47 +0000 (12:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 24 Jul 2015 10:09:47 +0000 (12:09 +0200)
commit3e0928c022c7d3f5419525e053a2cab3874e91c7
treeeae169940cbd6b62de071b788a18868167b86223
parent5e8dccff6b337dc48c2b0e9ad45abe8716a27d76
parent2201e28c1b40b88c9ddccdccf41ad90cd7321f6f
Merge branch '2014.09' into 2015.07