From: Paul Brossier <piem@piem.org>
Date: Mon, 8 Oct 2012 16:21:07 +0000 (-0600)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.4.3~5^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2f334100f80314f680794ddb58bbfdcde7af52ed;p=timeside.git

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

2f334100f80314f680794ddb58bbfdcde7af52ed