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)
commitd83d96725098f4f3e4be9ff0699ad39ca0aa8d3f
treeee72e6a0b2180a219ec430f6303eb14a446f5d67
parentfdac88a2c6b41cebb5e71e9c4b736c04413231c5
parent57e3a0088749af076931553ed7945594d3a813a4
Merge branch 'master' of github.com:tla/stemmatology