From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Sep 2012 22:45:34 +0000 (+0200)
Subject: Merge branch 'dev' into aubio
X-Git-Tag: 0.4.3~4^2^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=89ec4fe839e1ddf45088645e705bf15babb0c7c1;p=timeside.git

Merge branch 'dev' into aubio
---

89ec4fe839e1ddf45088645e705bf15babb0c7c1