From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 29 Apr 2014 09:55:38 +0000 (+0200)
Subject: Merge branch 'dev' into server
X-Git-Tag: 0.5.5~1^2~33
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9c92be3d1ec4d6c40aa486e12b41d7c23247e9d8;p=timeside.git

Merge branch 'dev' into server
---

9c92be3d1ec4d6c40aa486e12b41d7c23247e9d8