From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 17 Jul 2014 07:59:14 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~55
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6ac7c67c6f3282ece2d80566b0fc5883099f5d2a;p=timeside.git

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

6ac7c67c6f3282ece2d80566b0fc5883099f5d2a