Merge branch 'master' of https://github.com/tla/stemmatology
authortla <tla@mit.edu>
Thu, 25 Sep 2014 14:26:24 +0000 (16:26 +0200)
committertla <tla@mit.edu>
Thu, 25 Sep 2014 14:26:24 +0000 (16:26 +0200)
commitec501766b01554b479b0c123bbce8051f60834c1
tree7cf5b036a8fc136637e0a4d771ef947d885afdaa
parentf5e442f9fb10e52e026b4fa98099c48005f3843d
parentbf5cb67b7b8a5986ed1156de42db6bdac16f787d
Merge branch 'master' of https://github.com/tla/stemmatology