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

Merge branch 'dev'
---

77f4c97d4547dd9ace8f5322d22c1799cc786b6b