From: Peter Schaefer <schaeferpm@gmail.com>
Date: Mon, 22 Jun 2015 10:05:22 +0000 (+0200)
Subject: Merge lva.cg.tuwien.ac.at:Weave into bullet
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=4b667c1dd7bd022a54c095d1b41cb9f6b3008569;p=cgue_weave.git

Merge lva.cg.tuwien.ac.at:Weave into bullet
---

4b667c1dd7bd022a54c095d1b41cb9f6b3008569