Merge 4.0.7 into releases
authorStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 23:58:19 +0000 (01:58 +0200)
committerStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 23:58:19 +0000 (01:58 +0200)

Trivial merge