From: Peter Schaefer <schaeferpm@gmail.com>
Date: Wed, 18 Mar 2015 13:10:16 +0000 (+0100)
Subject: Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=5943415658bfa7fcb4cd0b21392d867b40304788;p=cgue_weave.git

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

5943415658bfa7fcb4cd0b21392d867b40304788