From: Peter Schaefer <schaeferpm@gmail.com>
Date: Wed, 24 Jun 2015 14:44:59 +0000 (+0200)
Subject: Merge branch 'bullet' of lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fbullet;p=cgue_weave.git

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

0b15549a814a7059a9d15a6144248e9307aebc9c