Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Wed, 7 Mar 2012 12:31:58 +0000 (13:31 +0100)]

Trivial merge