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

Trivial merge