From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 20 May 2014 09:26:59 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a0b642e55eb43ff6ccf7663d296bfd6a185ba249;p=timeside-diadems.git

Merge branch 'dev'
---

a0b642e55eb43ff6ccf7663d296bfd6a185ba249