Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Fri, 15 Jun 2012 14:16:14 +0000 (16:16 +0200)]

Trivial merge