From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 14 Feb 2014 16:03:22 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.4~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c5af606f6246270006e51f659cdddf707961e8a3;p=timeside.git

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

c5af606f6246270006e51f659cdddf707961e8a3