From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 15 Oct 2013 20:44:12 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.0~18^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f2f31656f73990048abfb291098e0e94a471f691;p=timeside.git

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

f2f31656f73990048abfb291098e0e94a471f691