Merge branch 'master' of github.com:tla/stemmatology
tla [Thu, 6 Sep 2012 20:46:59 +0000 (22:46 +0200)]

Trivial merge