From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 6 Oct 2014 14:54:33 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~24^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=446f2caf69f9b90939bbd41ff5672d66b38c8ba9;p=timeside.git

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

446f2caf69f9b90939bbd41ff5672d66b38c8ba9