Merge branch 'notes' of aubio.org:/git/aubio/aubio into notes
authorPaul Brossier <piem@piem.org>
Fri, 22 Aug 2014 15:41:25 +0000 (10:41 -0500)
committerPaul Brossier <piem@piem.org>
Fri, 22 Aug 2014 15:41:25 +0000 (10:41 -0500)

Trivial merge