Merge branch 'master' of github.com:tla/stemmatology
authortla <tla@mit.edu>
Tue, 31 May 2011 12:13:54 +0000 (14:13 +0200)
committertla <tla@mit.edu>
Tue, 31 May 2011 12:13:54 +0000 (14:13 +0200)
commit9ee7ecc60ae78c1d093c45bcab59745e726633fa
tree7418cdec4b3a698d66071c676176cdc15c132e20
parentcda6a45b9b206364ffe567844cbfa1d80697fd81
parentef9d481f7daed4be35590fddeff67d0cdfd1cd83
Merge branch 'master' of github.com:tla/stemmatology