From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 21 Oct 2014 18:38:45 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=82c3e694a3cc4cf4a4632e60a42d9fecb44cdc63;p=timeside.git

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

82c3e694a3cc4cf4a4632e60a42d9fecb44cdc63