From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 21 Jan 2014 00:03:25 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.5.3~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f45ff4cc87afe619790a11e29300f22a837f7c3f;p=timeside.git

Merge branch 'master' into dev
---

f45ff4cc87afe619790a11e29300f22a837f7c3f