From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 18 Mar 2015 16:14:03 +0000 (+0100)
Subject: Merge branch 'dev' into feature/mysql
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7cd7c3bcc76157be9d4883ed6314563149972640;p=timeside.git

Merge branch 'dev' into feature/mysql
---

7cd7c3bcc76157be9d4883ed6314563149972640