From: LockedLunatic <locked.lunatic@aon.at>
Date: Tue, 28 Jun 2016 01:42:36 +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=139d5d635e5afbc16077c6d4ee00cb292c75797a;p=cgue_weave.git

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

139d5d635e5afbc16077c6d4ee00cb292c75797a