From: Peter Schaefer <schaeferpm@gmail.com>
Date: Fri, 20 May 2016 15:47:58 +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=05da2877b798938229ce054cbfe0d3ec7166f160;p=cgue_weave.git

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

05da2877b798938229ce054cbfe0d3ec7166f160