From: LockedLunatic <locked.lunatic@aon.at>
Date: Tue, 14 Apr 2015 23:03:37 +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=ac7ee64779045904d1b0c0e9d16c785a932c2007;p=cgue_weave.git

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

ac7ee64779045904d1b0c0e9d16c785a932c2007