Merge branch 'master' of github.com:tla/stemmatology
tla [Tue, 13 Aug 2013 07:56:18 +0000 (09:56 +0200)]

Trivial merge