From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 10 Oct 2013 16:49:48 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.0~37
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0e5e0c51f4557edbc3c24f0c716fc5a42a198e7f;p=timeside.git

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

0e5e0c51f4557edbc3c24f0c716fc5a42a198e7f