From: Paul Brossier <piem@piem.org>
Date: Thu, 5 Dec 2013 13:06:55 +0000 (-0500)
Subject: Merge branch 'develop' into avcodec
X-Git-Tag: 0.4.0-beta1~52^2~17
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=75eb1824f4c60323a0a4ec7660ce38423ebab0a5;p=aubio.git

Merge branch 'develop' into avcodec
---

75eb1824f4c60323a0a4ec7660ce38423ebab0a5