From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 24 Oct 2014 09:32:58 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=688db91adca7065129d329c4bee5ac6362e5c474;p=timeside-diadems.git

Merge branch 'dev'
---

688db91adca7065129d329c4bee5ac6362e5c474