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)

Trivial merge