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

Merge branch 'dev'
---

86ddcc7a4b1e0637dfaa89ab3b8515ad2b6b9c3e