From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 15 May 2014 10:17:02 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~1^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2b07a3bf2288ec57f476644aa9ca92803453ff3f;p=timeside.git

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

2b07a3bf2288ec57f476644aa9ca92803453ff3f