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

Merge branch 'release/0.4.0'
---

e2b1101dcf2ec33eac80eba1ae9731c9297fb398