Merge branch 'master' of github.com:tla/stemmatology
tla [Wed, 14 Mar 2012 22:17:08 +0000 (23:17 +0100)]

Trivial merge