From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 16 May 2014 07:08:31 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~1^2~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=857e8bcab8be4d17fe5d16bb36957f813569b3fa;p=timeside.git

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

857e8bcab8be4d17fe5d16bb36957f813569b3fa