From: Peter Schaefer <schaeferpm@gmail.com>
Date: Wed, 27 May 2015 09:32:40 +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=8bff70c4d37b33b8ff07f358166d70809cab5351;p=cgue_weave.git

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

8bff70c4d37b33b8ff07f358166d70809cab5351