From: Paul Brossier <piem@piem.org>
Date: Tue, 29 Jan 2013 18:10:51 +0000 (-0500)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.4.3~1^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=be0aa875802ea7698d9f6acc16046346423d83b0;p=timeside.git

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

be0aa875802ea7698d9f6acc16046346423d83b0