Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Wed, 5 Oct 2011 21:10:56 +0000 (23:10 +0200)]

Trivial merge