From: LockedLunatic <locked.lunatic@aon.at>
Date: Thu, 7 May 2015 12:29:20 +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=434b062d68d62495a650d6ddd4be073d33e17cca;p=cgue_weave.git

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

434b062d68d62495a650d6ddd4be073d33e17cca