From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 9 Apr 2014 00:04:26 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4840c6c5dafcbd69005e5bc24461a8f5c03f126e;p=timeside-diadems.git

Merge branch 'dev'
---

4840c6c5dafcbd69005e5bc24461a8f5c03f126e