From: Peter Schaefer <schaeferpm@gmail.com>
Date: Wed, 6 May 2015 15:47:45 +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=103af2a06eebe46efe264d197c1a01cf225f04d8;p=cgue_weave.git

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

103af2a06eebe46efe264d197c1a01cf225f04d8