From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 23 Oct 2014 08:32:53 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f26cafcf9e80fd0e997b351ea77b7a2975229fb8;p=timeside-diadems.git

Merge branch 'dev'
---

f26cafcf9e80fd0e997b351ea77b7a2975229fb8