Merge branch 'develop' of github.com:aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Mon, 25 Apr 2016 15:50:11 +0000 (17:50 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 25 Apr 2016 15:50:11 +0000 (17:50 +0200)

Trivial merge