Merge branch 'master' of https://github.com/tla/stemmatology
authortla <tla@mit.edu>
Tue, 2 Dec 2014 14:43:54 +0000 (15:43 +0100)
committertla <tla@mit.edu>
Tue, 2 Dec 2014 14:43:54 +0000 (15:43 +0100)
commit3639e1a291f81eec50a4e21e6d652e948026ba0c
tree36904f290d497e4d7a8d50e0137ceee825de92cd
parent965b52c3732ed2f36602d496d47dae372292b7e0
parenta512d0e6b2ab520f8f757e92967498ee885dd8c4
Merge branch 'master' of https://github.com/tla/stemmatology