Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Tue, 4 Oct 2011 00:17:13 +0000 (02:17 +0200)]

Trivial merge