Merge branch 'master' of github.com:tla/stemmatology
authorTara L Andrews <tla@mit.edu>
Sat, 16 Jun 2012 20:59:46 +0000 (22:59 +0200)
committerTara L Andrews <tla@mit.edu>
Sat, 16 Jun 2012 20:59:46 +0000 (22:59 +0200)
commit3c723b3ebaf55021ad0db37f11bb4b84e71538a7
treecf9486c5bd32f8df245f493a1f5fde6a50eb6060
parentdd007c4dc0296f626be5ecf67d8161a446851068
parent227d4a1124cebc6d3149f886a3b0edc37fe7a3cd
Merge branch 'master' of github.com:tla/stemmatology