From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 16 Dec 2013 16:53:28 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.5.3~36
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a6ada08c46bd7bc586372f878deb870c6d27556f;p=timeside.git

Merge branch 'master' into dev
---

a6ada08c46bd7bc586372f878deb870c6d27556f