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)
commita5647981a9c3d729ba1a8f49cdbd846354a76526
tree9f8d42d873ff2b22ed5358ffd383f0f758a2f628
parent5ba6c2b4ba533e523ef693fc6f84e4e9c8ef3bfc
parent3366a6baa7d38289ca34a5f4b7aee988dede275a
Merge branch 'master' of github.com:tla/stemmatology