Merge branch 'master' of github.com:tla/stemmatology
Joris van Zundert [Tue, 4 Oct 2011 00:02:55 +0000 (02:02 +0200)]

Trivial merge