Merge branch 'master' of https://github.com/tla/stemmatology
tla [Sun, 7 Dec 2014 20:31:26 +0000 (21:31 +0100)]

Trivial merge