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

Trivial merge