From: Peter Schaefer <schaeferpm@gmail.com>
Date: Tue, 3 May 2016 20:36:45 +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=6da9c12a79f35e8ef5d0f51bbc6c291866c69522;p=cgue_weave.git

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

6da9c12a79f35e8ef5d0f51bbc6c291866c69522