From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 25 Nov 2013 13:44:56 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~41^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e7956bcc1660e6086dfc23eabcd4ec23eaab6d46;p=timeside.git

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

e7956bcc1660e6086dfc23eabcd4ec23eaab6d46