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

Merge branch 'dev' into aubio
---

1a4fca88e2ca40797b66e8698bc708c9c0d78292