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

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

46f4c375c8d5fdefa3b1133e15029b6088e9025a