From: Paul Brossier <piem@piem.org>
Date: Wed, 16 Oct 2013 09:08:28 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.0
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=df8ce49e71c3a5c34bb679bdf3bc21b1ec9b9425;p=timeside.git

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

df8ce49e71c3a5c34bb679bdf3bc21b1ec9b9425