Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Thu, 30 Aug 2012 22:22:21 +0000 (00:22 +0200)]

Trivial merge