From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 16 Dec 2013 08:48:26 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3607034647824a5d74691754fdd4f959bca8ecda;p=timeside.git

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

3607034647824a5d74691754fdd4f959bca8ecda