Merge branch 'master' of github.com:tla/stemmatology
tla [Sun, 19 Jan 2014 19:36:51 +0000 (20:36 +0100)]

Trivial merge