Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Fri, 20 Jan 2012 23:51:32 +0000 (00:51 +0100)]

Trivial merge