Merge branch '2015.07'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:39:38 +0000 (12:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:39:38 +0000 (12:39 +0200)
commit14b574a85db764acabae27486437d4357a63a182
tree57adb618d85fe91486efcb7b2bf2be63f5a39ec9
parentddea609e2b2c8f7df5635706fed38cf5ed660786
parent1e36e7ccbd49516136613997a85655d6a85a579e
Merge branch '2015.07'