Merge branch 'master' of https://github.com/tla/stemmatology
tla [Sun, 22 Dec 2013 21:46:57 +0000 (22:46 +0100)]

Trivial merge