From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 4 Jun 2014 14:44:24 +0000 (+0200)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a736e59871c2d552d715399b5f83fcf2e906a31c;p=timeside.git

Merge branch 'dev' into diadems
---

a736e59871c2d552d715399b5f83fcf2e906a31c