Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Thu, 6 Oct 2011 07:36:25 +0000 (09:36 +0200)]

Trivial merge