Merge branch 'master' into newer-midi
commit6f163a0e0582fe4d4dd44908dfa5d7579a1244ae
authorStephane Letz <letz@grame.fr>
Thu, 31 Mar 2011 08:50:46 +0000 (31 10:50 +0200)
committerStephane Letz <letz@grame.fr>
Thu, 31 Mar 2011 08:50:46 +0000 (31 10:50 +0200)
tree2feebecd7ea474d8ed439c3a165daf80fae32a65
parentceb7c50ec4240ba1bbb333b4c3e1656a8dcd2a81
parent9280aa834e29d38d53ed6d6638de4ba20b42639d
Merge branch 'master' into newer-midi