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

Merge branch 'master' into aubio
---

2ad4aefdfecb1c8784aefb62283dfa259e5ab706