From: yomguy <yomguy@parisson.com>
Date: Fri, 28 Sep 2012 22:45:34 +0000 (+0200)
Subject: Merge branch 'dev' into aubio
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b1c9aeb7bd54847b19a8d16a5ef0aa2ddfe059c6;p=timeside-diadems.git

Merge branch 'dev' into aubio
---

b1c9aeb7bd54847b19a8d16a5ef0aa2ddfe059c6