Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Aug 2015 17:16:57 +0000 (19:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Aug 2015 17:16:57 +0000 (19:16 +0200)
commit4682a3759984e235af7c6e0a55cd171d56ba9468
treee4ae36719c1d731b175c8aa322794e6fc96f49ae
parent97cc03e94064e944f4a069f47b992dd62e1f42f3
parent2a99166ac3ca5722a2bb4459546ce3cba4a39b98
Merge branch '2014.09' into 2015.07