From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 19 May 2014 13:24:25 +0000 (+0200)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1b11646fbe62b03ed2a3284c0567ddd5ecbb507f;p=timeside.git

Merge branch 'dev' into diadems
---

1b11646fbe62b03ed2a3284c0567ddd5ecbb507f