Merge branch 'master' of github.com:tla/stemmatology
Joris van Zundert [Tue, 4 Sep 2012 22:19:23 +0000 (00:19 +0200)]

Trivial merge