From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 24 Jun 2014 23:21:39 +0000 (+0200)
Subject: Merge branch 'master' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c6661e2e91cbbb3d6f516a5dc94b530b5ceaf015;p=timeside.git

Merge branch 'master' into diadems
---

c6661e2e91cbbb3d6f516a5dc94b530b5ceaf015