From: Paul Brossier <piem@piem.org>
Date: Mon, 15 Apr 2013 16:11:59 +0000 (-0500)
Subject: Merge branch 'aubio' of github.com:yomguy/TimeSide into aubio
X-Git-Tag: 0.5.0~115^2~20
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4eae5a74290cf5a3fbda95172111caf0d55dee3c;p=timeside.git

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

4eae5a74290cf5a3fbda95172111caf0d55dee3c