From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 24 Jun 2014 23:21:15 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.6~4^2~77^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=422819c50ba66477df94fb08e544bf953746b67f;p=timeside.git

Merge branch 'master' into dev
---

422819c50ba66477df94fb08e544bf953746b67f