Merge branch 'master' of github.com:tla/stemmatology
tla [Tue, 28 Aug 2012 19:04:04 +0000 (21:04 +0200)]

Trivial merge