From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 20 Jan 2014 09:19:01 +0000 (+0100)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5f3311943e0720a7e5420127538eeef2e68d86be;p=timeside.git

Merge branch 'dev' into diadems
---

5f3311943e0720a7e5420127538eeef2e68d86be