Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Thu, 12 Jul 2012 23:12:37 +0000 (01:12 +0200)]

Trivial merge