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

Merge branch 'dev' into aubio
---

8c40bba02be15fd7d803c73b1ebed1068eee2d33