From: Peter Schaefer <schaeferpm@gmail.com>
Date: Thu, 19 May 2016 10:55:35 +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=d017b44dabb560c23ce93975378699767c6d5e28;p=cgue_weave.git

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

d017b44dabb560c23ce93975378699767c6d5e28