From: Peter Schaefer <schaeferpm@gmail.com>
Date: Wed, 29 Jun 2016 06:21:32 +0000 (+0200)
Subject: Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=e90e4f0fe3ec8c86f0b193713ba2d64fe35a8e2b;p=cgue_weave.git

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

e90e4f0fe3ec8c86f0b193713ba2d64fe35a8e2b