From: Paul Brossier <piem@piem.org>
Date: Mon, 9 Dec 2013 18:42:46 +0000 (-0500)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.4.1~112
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=01cdf92279cb8438cb43d89054022e5e5a448da2;p=aubio.git

Merge branch 'master' into develop
---

01cdf92279cb8438cb43d89054022e5e5a448da2