Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Fri, 3 Jun 2011 13:02:42 +0000 (15:02 +0200)]

Trivial merge