Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Sat, 16 Jun 2012 20:59:46 +0000 (22:59 +0200)]

Trivial merge