From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 27 May 2014 11:31:56 +0000 (+0200)
Subject: Merge Dev into current branch
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=84adf37a9e62d1f62120f4e3ff9a15d725429597;p=timeside-diadems.git

Merge Dev into current branch
---

84adf37a9e62d1f62120f4e3ff9a15d725429597