From: LockedLunatic <locked.lunatic@aon.at>
Date: Mon, 4 May 2015 21:11:14 +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=7379efc40209f2b5d89612c4d0d0027daa3efd9d;p=cgue_weave.git

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

7379efc40209f2b5d89612c4d0d0027daa3efd9d