From: LockedLunatic <locked.lunatic@aon.at>
Date: Thu, 23 Apr 2015 00:14:29 +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=3be134fc8579e2575bb6dd1fa8d71c684789a1fd;p=cgue_weave.git

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

3be134fc8579e2575bb6dd1fa8d71c684789a1fd