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

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

8ba89ff5fd35b8c276d02f02ea427e5ed359e9db