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

Merge dev branch into diadems
---

d79c7b6708be5c508de684bc67bfe40e613d2e53