From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 15 Apr 2013 15:25:18 +0000 (+0200)
Subject: Merge branch 'aubio' of github.com:yomguy/TimeSide into aubio
X-Git-Tag: 0.5.0~115^2~20^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8f2c4c4f98422fe8d14a4719cd9d9d299ddd922f;p=timeside.git

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

8f2c4c4f98422fe8d14a4719cd9d9d299ddd922f