From: LockedLunatic <locked.lunatic@aon.at>
Date: Thu, 23 Jun 2016 23:45:18 +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=c6806ece964e325a6576fe6513765d76fa64bc2a;p=cgue_weave.git

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

c6806ece964e325a6576fe6513765d76fa64bc2a