From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 18 Oct 2013 23:44:49 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.5.1-0~30
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c9ce4e35b1733a7949ff3666aa756a0244928273;p=timeside.git

Merge branch 'master' into dev
---

c9ce4e35b1733a7949ff3666aa756a0244928273