From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 12 Nov 2013 13:34:27 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.5.2~53
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9e4652f1c84869c90eea1a23e1c0514fa5847359;p=timeside.git

Merge branch 'master' into dev
---

9e4652f1c84869c90eea1a23e1c0514fa5847359