From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 2 Jul 2014 23:05:33 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~70^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d398a82688e72aabe12ca94f67189a4ff9ddd523;p=timeside.git

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

d398a82688e72aabe12ca94f67189a4ff9ddd523