Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Mon, 3 Oct 2011 15:39:55 +0000 (17:39 +0200)]

Trivial merge