Merge branch 'master' of https://github.com/tla/stemmatology
authortla <tla@mit.edu>
Sun, 7 Dec 2014 20:31:26 +0000 (21:31 +0100)
committertla <tla@mit.edu>
Sun, 7 Dec 2014 20:31:26 +0000 (21:31 +0100)
commit540ea75e6299de8fa447cd38b2905f4325d69218
treee4b218440e38f59dd674039ec2187c78dbed827a
parent148c2eb104dcdf73c6808e551e8fd938d46beb77
parent2e8187032da10dfcf513cb3c70907912aa9698f6
Merge branch 'master' of https://github.com/tla/stemmatology