From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 24 Oct 2014 17:20:57 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=443094fa74c57be194cedda4a1fd6b3ca32056d3;p=timeside-diadems.git

Merge branch 'dev'
---

443094fa74c57be194cedda4a1fd6b3ca32056d3