Merge branch 'master' of aubio.org:/git/aubio/aubio
authorPaul Brossier <piem@piem.org>
Tue, 22 Nov 2011 04:36:42 +0000 (20:36 -0800)
committerPaul Brossier <piem@piem.org>
Tue, 22 Nov 2011 04:36:42 +0000 (20:36 -0800)
commitabf13a1e4de056106b1834d7f1f8b1ed292b972c
treee3cd2655080e57bb851e4bc6a5c7f66215b55146
parentb70c6f1ad1e24b84155e37e90b6ebecfcc64958c
parenta5bf9a5fbf5bfa27d7691ec286f128ead7a082e9
Merge branch 'master' of aubio.org:/git/aubio/aubio