From: yomguy <yomguy@parisson.com>
Date: Wed, 19 Sep 2012 09:26:40 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3380566120b8c987a4fa84266859e1bce523b485;p=timeside-diadems.git

Merge branch 'master' into dev
---

3380566120b8c987a4fa84266859e1bce523b485