Merge branch 'master' of github.com:tla/stemmatology
tla [Tue, 28 Aug 2012 18:09:34 +0000 (20:09 +0200)]

Trivial merge