Merge branch 'master' of github.com:tla/stemmatology
authorJoris van Zundert <joris.van.zundert@gmail.com>
Mon, 3 Sep 2012 20:33:16 +0000 (22:33 +0200)
committerJoris van Zundert <joris.van.zundert@gmail.com>
Mon, 3 Sep 2012 20:33:16 +0000 (22:33 +0200)
commit34e2616f53263138f20f93db079fa0df1bfc20e1
tree4ca248ff64f4720a27e5ff61818537d1b417f7a4
parent8927ef0b6c1ede70e9dbd7ea514d60cc320fb32e
parent34f433e20e875be89b593327db1ffcb546da4a84
Merge branch 'master' of github.com:tla/stemmatology