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-Tag: 0.4.1~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a3eb31b1fcc6f31d70fc0ba6b745dc81815c8ba8;p=timeside.git

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

a3eb31b1fcc6f31d70fc0ba6b745dc81815c8ba8