From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 21:02:27 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=04962d7baba20d5de97d733c49d2fa451f394936;p=timeside-diadems.git

Merge branch 'master' into dev
---

04962d7baba20d5de97d733c49d2fa451f394936