Merge branch 'master' of https://github.com/tla/stemmatology
tla [Tue, 2 Dec 2014 14:43:54 +0000 (15:43 +0100)]

Trivial merge