From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Oct 2013 07:57:36 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.0~36
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=18eb4a5bbd581ead00c1f5d3d9a498055d9a4790;p=timeside.git

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

18eb4a5bbd581ead00c1f5d3d9a498055d9a4790