From: Paul Brossier <piem@piem.org>
Date: Tue, 3 Dec 2013 17:28:23 +0000 (-0500)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~8^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9b710a8f9fd423ed22982472370fe408db88bc13;p=timeside.git

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

9b710a8f9fd423ed22982472370fe408db88bc13