Merge branch 'master' of github.com:tla/stemmatology
tla [Wed, 14 Aug 2013 14:20:43 +0000 (16:20 +0200)]

Trivial merge