From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Sep 2012 22:02:11 +0000 (+0200)
Subject: Merge branch 'release/0.4.0' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=da800c702aba49d26555bca9c121c11390b7f1ee;p=timeside-diadems.git

Merge branch 'release/0.4.0' into dev
---

da800c702aba49d26555bca9c121c11390b7f1ee