From: LockedLunatic <locked.lunatic@aon.at>
Date: Tue, 28 Jun 2016 05:17:35 +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=869d225b99c0d7505c680c5409302765ec0c8dd8;p=cgue_weave.git

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

869d225b99c0d7505c680c5409302765ec0c8dd8