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

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

ff796b63adec04f3ebab88794de857ea60a6fe57