Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Wed, 26 Sep 2012 21:09:26 +0000 (23:09 +0200)]

Trivial merge