From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 21 Apr 2014 20:56:56 +0000 (+0200)
Subject: Merge branch 'dev' into server
X-Git-Tag: 0.5.5~1^2~49
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8e7e03eddcadd65301e3ceeda299b7bada48f6d5;p=timeside.git

Merge branch 'dev' into server
---

8e7e03eddcadd65301e3ceeda299b7bada48f6d5