Merge branch 'master' of https://github.com/tla/stemmatology
authortla <tla@mit.edu>
Thu, 22 Aug 2013 09:24:15 +0000 (11:24 +0200)
committertla <tla@mit.edu>
Thu, 22 Aug 2013 09:24:15 +0000 (11:24 +0200)
commitf45e6a5d646aa72a069a86d6e95f6f4a22570a3e
tree3c77678b2ced123fe0ecfc47facc5c3de5102a50
parent3b1d40a5bb16f57e8c3354111f65760c7597538d
parent57560672d830e753e2c9a8880e2ea74d0c245253
Merge branch 'master' of https://github.com/tla/stemmatology