Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Sun, 10 Feb 2013 20:10:01 +0000 (15:10 -0500)
committerPaul Brossier <piem@piem.org>
Sun, 10 Feb 2013 20:10:01 +0000 (15:10 -0500)

Trivial merge