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

Merge branch 'dev' into aubio
---

83bcd318ef5482cabc7c6b3a760fd14df435b091