From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 19 May 2014 13:19:05 +0000 (+0200)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=285341c30d5af9c67b0cc8ecce40dc4284edf1a0;p=timeside.git

Merge branch 'dev' into diadems
---

285341c30d5af9c67b0cc8ecce40dc4284edf1a0