Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Wed, 5 Sep 2012 05:19:11 +0000 (07:19 +0200)]

Trivial merge