From: yomguy <yomguy@parisson.com>
Date: Sat, 6 Oct 2012 21:05:58 +0000 (+0200)
Subject: Merge branch 'dev' into aubio
X-Git-Tag: 0.4.3~4^2^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3fc3c1c9f4206787288403e347cd7306afd3dc5d;p=timeside.git

Merge branch 'dev' into aubio
---

3fc3c1c9f4206787288403e347cd7306afd3dc5d