Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Fri, 8 Jun 2012 10:35:56 +0000 (12:35 +0200)]

Trivial merge