Merge branch 'master' into newer-midi
commitf8dd88494a0aeb1c735a79e0a386971b47f5ed76
authorStephane Letz <letz@grame.fr>
Tue, 29 Mar 2011 12:29:32 +0000 (29 14:29 +0200)
committerStephane Letz <letz@grame.fr>
Tue, 29 Mar 2011 12:29:32 +0000 (29 14:29 +0200)
treecae1a4cc88610fef9903b92053572f165701c925
parentc362b8b0bb29f3e15e9e8294be4091e993393868
parent98fc075356be8ec15dfc9d35f96d581c840ceee8
Merge branch 'master' into newer-midi