From: LockedLunatic <locked.lunatic@aon.at>
Date: Tue, 28 Jun 2016 04:24:33 +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=1e823865854affe89460cadd118d726413529018;p=cgue_weave.git

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

1e823865854affe89460cadd118d726413529018