Merge branch 'master' of github.com:tla/stemmatology
tla [Mon, 10 Sep 2012 19:59:21 +0000 (21:59 +0200)]

Trivial merge