From: LockedLunatic <locked.lunatic@aon.at>
Date: Thu, 23 Jun 2016 22:44:10 +0000 (+0200)
Subject: Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=4c43d436b1eb0f651ce9d82d3210294ba3c06ec7;p=cgue_weave.git

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

4c43d436b1eb0f651ce9d82d3210294ba3c06ec7