Merge branch 'master' of github.com:tla/stemmatology
tla [Fri, 15 Jun 2012 20:44:44 +0000 (22:44 +0200)]

Trivial merge