From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 16 Dec 2013 16:55:49 +0000 (+0100)
Subject: Merge branch 'dev' into server
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1518ff0c2b77d9590219ac4283b7935b7d866d5d;p=timeside-diadems.git

Merge branch 'dev' into server
---

1518ff0c2b77d9590219ac4283b7935b7d866d5d