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

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

706dde1656660b57cfdbfe5f48f1056c32819249