Merge branch 'master' of https://github.com/tla/stemmatology
tla [Thu, 22 Aug 2013 09:24:15 +0000 (11:24 +0200)]

Trivial merge