From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 27 May 2014 10:00:14 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.6~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a9b8fb33742cf7c461489c76d406137ecaa60544;p=timeside.git

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

a9b8fb33742cf7c461489c76d406137ecaa60544