From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 14 Feb 2014 10:59:14 +0000 (+0100)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ff7f36031bfd1489a7b1822e7f729862d48d8100;p=timeside.git

Merge branch 'dev' into diadems
---

ff7f36031bfd1489a7b1822e7f729862d48d8100