Merge branch 'master' of github.com:tla/stemmatology
Joris van Zundert [Fri, 31 Aug 2012 22:11:20 +0000 (00:11 +0200)]

Trivial merge