From: LockedLunatic <locked.lunatic@aon.at>
Date: Thu, 23 Apr 2015 18:01:34 +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=8f783a9752f78d41eabb1bfbbe5159768f2df22d;p=cgue_weave.git

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

8f783a9752f78d41eabb1bfbbe5159768f2df22d