From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 16 Dec 2013 16:55:49 +0000 (+0100)
Subject: Merge branch 'dev' into server
X-Git-Tag: 0.5.5~1^2~78
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ac7e615502008b132082ea82ca98b2abb32a95cb;p=timeside.git

Merge branch 'dev' into server
---

ac7e615502008b132082ea82ca98b2abb32a95cb