From: Paul Brossier <piem@piem.org>
Date: Tue, 16 Apr 2013 00:04:54 +0000 (-0500)
Subject: Merge branch 'aubio' of github.com:yomguy/TimeSide into aubio
X-Git-Tag: 0.5.0~115^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=162ab11dcae993fad75f9df18016bcaf12d1b6ec;p=timeside.git

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

162ab11dcae993fad75f9df18016bcaf12d1b6ec