Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Thu, 4 Jul 2013 22:09:53 +0000 (00:09 +0200)]

Trivial merge