Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 08:57:05 +0000 (10:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 08:57:05 +0000 (10:57 +0200)
commit4616bd879122e538ab3c3b74dc325f1f1f5ac931
tree134b2567cc7f171180b593ed1e97738d0282d444
parent191664369c0746dec1451209f22b05e40d5408ca
parent9a8d20355fe0b69cfc570044d27dc6bcc5155d4a
Merge branch '2014.09' into 2015.07