From: Peter Schaefer <schaeferpm@gmail.com>
Date: Mon, 18 Apr 2016 11:07:39 +0000 (+0200)
Subject: Merge branch 'bloom' of lva.cg.tuwien.ac.at:Weave into bloom
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fbloom;p=cgue_weave.git

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

b7287138b5958a8eb99fc617bdcffa30bd4fcf25