From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 18 Oct 2013 23:44:49 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b75a4dfab1c157abf5c29961e2e57d3207fe874f;p=timeside-diadems.git

Merge branch 'master' into dev
---

b75a4dfab1c157abf5c29961e2e57d3207fe874f