From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 6 Mar 2015 08:53:51 +0000 (+0100)
Subject: Merge branch 'dev' into feature/wave
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=88024902a8a008f134b589103ac75dc38d767d61;p=timeside.git

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

88024902a8a008f134b589103ac75dc38d767d61