From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 19 Jun 2014 12:01:34 +0000 (+0200)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7d92aae1f947ef98d1ecac455001ec6a1c7a643e;p=timeside.git

Merge branch 'dev' into diadems
---

7d92aae1f947ef98d1ecac455001ec6a1c7a643e