Merge branch 'master' of github.com:tla/stemmatology
Joris van Zundert [Mon, 3 Sep 2012 20:33:16 +0000 (22:33 +0200)]

Trivial merge