From: Peter Schaefer <schaeferpm@gmail.com>
Date: Tue, 21 Apr 2015 21:16:44 +0000 (+0200)
Subject: Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=68b77657115eb3ddb7c96baccc5a5689ed987d59;p=cgue_weave.git

Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
---

68b77657115eb3ddb7c96baccc5a5689ed987d59