From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 24 Oct 2014 17:18:04 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~1^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0c900e8471f469c78d4b84bd8a287d41681ab4ad;p=timeside.git

Merge branch 'dev' of github.com:yomguy/TimeSide into dev
---

0c900e8471f469c78d4b84bd8a287d41681ab4ad