Merge branch 'notes' of aubio.org:/git/aubio/aubio into notes
authorPaul Brossier <piem@piem.org>
Sun, 24 Aug 2014 17:24:42 +0000 (12:24 -0500)
committerPaul Brossier <piem@piem.org>
Sun, 24 Aug 2014 17:24:42 +0000 (12:24 -0500)

Trivial merge