From: Peter Schaefer <schaeferpm@gmail.com>
Date: Tue, 28 Jun 2016 04:09:15 +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=1b05b0caa34ff9a72d665051816dcfb47ba571b7;p=cgue_weave.git

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

1b05b0caa34ff9a72d665051816dcfb47ba571b7