From: LockedLunatic <locked.lunatic@aon.at>
Date: Tue, 21 Apr 2015 14:19:40 +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=883fde70f9a3be6274c04cfc235d8ea47c2686a4;p=cgue_weave.git

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

Conflicts:
	.gitignore
---

883fde70f9a3be6274c04cfc235d8ea47c2686a4