From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 27 May 2014 10:21:10 +0000 (+0200)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d76709413f0dc5709b2eafb7d280444c4098e71b;p=timeside.git

Merge branch 'dev' into diadems
---

d76709413f0dc5709b2eafb7d280444c4098e71b