From: yomguy <yomguy@parisson.com>
Date: Mon, 8 Oct 2012 15:45:01 +0000 (+0200)
Subject: Merge branch 'master' into aubio
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3a092b361b36768a7f1e8d5d19ac26f46769bbe6;p=timeside-diadems.git

Merge branch 'master' into aubio
---

3a092b361b36768a7f1e8d5d19ac26f46769bbe6