Merge 2.0.1 into releases
authorStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 21:54:06 +0000 (23:54 +0200)
committerStephen Sinclair <sinclair@music.mcgill.ca>
Thu, 10 Oct 2013 21:54:06 +0000 (23:54 +0200)

Trivial merge