Merge branch 'master' of https://github.com/tla/stemmatology
tla [Thu, 25 Sep 2014 14:26:24 +0000 (16:26 +0200)]

Trivial merge