From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 20 May 2014 09:32:33 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9fed403fa8e8fb9c166eed86ab05656a25ff2426;p=timeside-diadems.git

Merge branch 'dev'
---

9fed403fa8e8fb9c166eed86ab05656a25ff2426