Merge branch 'master' of github.com:tla/stemmatology
tla [Thu, 15 Mar 2012 10:03:29 +0000 (11:03 +0100)]

Trivial merge