Merge branch 'master' of github.com:tla/stemmatology
tla [Tue, 28 Aug 2012 12:24:00 +0000 (14:24 +0200)]

Trivial merge