From: Paul Brossier <piem@piem.org>
Date: Mon, 8 Jul 2013 22:04:07 +0000 (-0500)
Subject: Merge branch 'master' of github.com:yomguy/TimeSide
X-Git-Tag: 0.4.4~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fa4302cd696cb3d4b962e49f4c8adae5b9068481;p=timeside.git

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

fa4302cd696cb3d4b962e49f4c8adae5b9068481