From: Peter Schaefer <schaeferpm@gmail.com>
Date: Mon, 4 May 2015 18:12:21 +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=8fa518982349474b2b1680fd92f8da87202faa4f;p=cgue_weave.git

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

8fa518982349474b2b1680fd92f8da87202faa4f