Merge branch 'master' of github.com:tla/stemmatology
Tara L Andrews [Fri, 21 Sep 2012 01:25:39 +0000 (03:25 +0200)]

Trivial merge