Merge branch 'master' of github.com:tla/stemmatology
authorJoris van Zundert <joris.van.zundert@gmail.com>
Fri, 31 Aug 2012 22:11:20 +0000 (00:11 +0200)
committerJoris van Zundert <joris.van.zundert@gmail.com>
Fri, 31 Aug 2012 22:11:20 +0000 (00:11 +0200)
commit210142377733aef217db6fe779386ea793be59e9
tree9677abbad4c96353ecc22b1735436e250bfe9e2c
parenteb9838ec3810febc38481cc31415780f79bf8a4f
parenta55f7ff644dfcf1a3dd1c212f8b9a10836797e1f
Merge branch 'master' of github.com:tla/stemmatology