From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 23:19:59 +0000 (+0200)
Subject: Merge branch 'dev' into aubio
X-Git-Tag: 0.4.3~4^2^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=45af5db28ae7daf5bf83b0d95f4778f4890c1df0;p=timeside.git

Merge branch 'dev' into aubio
---

45af5db28ae7daf5bf83b0d95f4778f4890c1df0