From: Paul Brossier <piem@piem.org>
Date: Sun, 10 Feb 2013 20:10:01 +0000 (-0500)
Subject: Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop
X-Git-Tag: 0.4.0-beta1~335^2~3
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=947bbd3086f0c3189c0064ac61f643a516822a2d;p=aubio.git

Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop
---

947bbd3086f0c3189c0064ac61f643a516822a2d