Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Thu, 2 Jan 2014 23:47:22 +0000 (19:47 -0400)
committerPaul Brossier <piem@piem.org>
Thu, 2 Jan 2014 23:47:22 +0000 (19:47 -0400)
commitd4791e577c6be4a777f0f5067a80eaf7be855422
treee0f9bbc037c0cf8173d57df6b52f01b19ffb886b
parent89e9e713046f25b3fa8a7db3bb488ce43943652e
parent4fe62ba2966e3d5bc55fa10ec9decfc5d702cce3
Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop