Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Wed, 11 Jul 2012 19:34:02 +0000 (21:34 +0200)]

Trivial merge