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

Merge branch 'dev' into aubio
---

f33e7349dc8a6723788573d60bf43860261965e7