From: Peter Schaefer <schaeferpm@gmail.com>
Date: Fri, 17 Jun 2016 10:33:05 +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=65e28a9c2aaad241fddbd6ea8779c5a39fb9da53;p=cgue_weave.git

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

65e28a9c2aaad241fddbd6ea8779c5a39fb9da53