From: Paul Brossier <piem@piem.org>
Date: Fri, 6 Dec 2013 02:30:20 +0000 (-0500)
Subject: Merge branch 'develop' into avcodec
X-Git-Tag: 0.4.0-beta1~52^2~12
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=af272654dfc3b6b37ba4a21ee354074ec7721901;p=aubio.git

Merge branch 'develop' into avcodec
---

af272654dfc3b6b37ba4a21ee354074ec7721901