From: yomguy <yomguy@parisson.com>
Date: Sat, 26 Jan 2013 15:40:13 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=af439b58c7ca221aff96431f058a9604ab1e3cc5;p=timeside-diadems.git

Merge branch 'dev'
---

af439b58c7ca221aff96431f058a9604ab1e3cc5