From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 6 Dec 2013 10:44:35 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.5.2~8^2~3^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fc79c6134beaf82bde9f0a57f062e0a2c5b2ff20;p=timeside.git

Merge branch 'master' into dev
---

fc79c6134beaf82bde9f0a57f062e0a2c5b2ff20