From: LockedLunatic <locked.lunatic@aon.at>
Date: Wed, 13 May 2015 12:28:39 +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=ccdc376cdd241c171138e7e130ea98e6c0e8e597;p=cgue_weave.git

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

ccdc376cdd241c171138e7e130ea98e6c0e8e597