From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 19 May 2014 13:17:48 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~1^2~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=867b9e34ed3a3d98425be4968cf9090e2ed48ad0;p=timeside.git

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

867b9e34ed3a3d98425be4968cf9090e2ed48ad0