From: Peter Schaefer <schaeferpm@gmail.com>
Date: Tue, 7 Jun 2016 06:51:38 +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=be4a4b55ac14839be900f01c29777bc6d1d450ed;p=cgue_weave.git

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

be4a4b55ac14839be900f01c29777bc6d1d450ed