Merge branch 'master' of github.com:tla/stemmatology
tla [Thu, 7 Jun 2012 11:58:07 +0000 (13:58 +0200)]

Trivial merge