From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 21 Mar 2014 16:24:46 +0000 (+0100)
Subject: Merge branch 'dev' into server
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6105037845db61f977c688979607da7ae24d2dc7;p=timeside-diadems.git

Merge branch 'dev' into server
---

6105037845db61f977c688979607da7ae24d2dc7