From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 3 Dec 2013 17:23:22 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=00cb665aa375b611e385cd6dd7affc77d31a851e;p=timeside.git

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

00cb665aa375b611e385cd6dd7affc77d31a851e