Merge branch 'master' of github.com:tla/stemmatology
authorJoris van Zundert <joris.van.zundert@gmail.com>
Fri, 20 Jan 2012 13:07:28 +0000 (14:07 +0100)
committerJoris van Zundert <joris.van.zundert@gmail.com>
Fri, 20 Jan 2012 13:07:28 +0000 (14:07 +0100)
commitea4e683f30880670fb4f892cacf7d846e8f52636
treecd29ee9dbe8e570e9faf290a079b873af04cef20
parenta88e75b1e7858fa3878155c70f473897694162ba
parent683f22b1428e77a1b61a56600e5f5ba9575f7af0
Merge branch 'master' of github.com:tla/stemmatology