From: yomguy <yomguy@parisson.com>
Date: Tue, 8 Jan 2013 10:32:45 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5a2acb875859bbc79d757c20849eda813cf29edf;p=timeside-diadems.git

Merge branch 'dev'
---

5a2acb875859bbc79d757c20849eda813cf29edf