From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 21 Mar 2014 16:24:46 +0000 (+0100)
Subject: Merge branch 'dev' into server
X-Git-Tag: 0.5.5~1^2~77
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2e1d5a65c6aa6dd0094ecc8d46843a969b990688;p=timeside.git

Merge branch 'dev' into server
---

2e1d5a65c6aa6dd0094ecc8d46843a969b990688