From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 3 Apr 2014 23:29:54 +0000 (+0200)
Subject: Merge branch 'dev' into server
X-Git-Tag: 0.5.5~1^2~71
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c4fb79ba339757ef5d75d198ab175dce6edf87a0;p=timeside.git

Merge branch 'dev' into server
---

c4fb79ba339757ef5d75d198ab175dce6edf87a0