From: Paul Brossier <piem@piem.org>
Date: Fri, 28 Sep 2012 21:18:43 +0000 (-0600)
Subject: Merge branch 'dev' into aubio
X-Git-Tag: 0.4.3~4^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=67806e8c8120320eba4364a67e43b0202264d142;p=timeside.git

Merge branch 'dev' into aubio
---

67806e8c8120320eba4364a67e43b0202264d142