Merge branch 'master' of github.com:tla/stemmatology
authortla <tla@mit.edu>
Fri, 15 Jun 2012 20:44:44 +0000 (22:44 +0200)
committertla <tla@mit.edu>
Fri, 15 Jun 2012 20:44:44 +0000 (22:44 +0200)
commit83cc24db722c0a64adce1fc73b23347d7cd43b60
treedcff4ad653e02d81643c6421fb89f83a950cdc47
parent9f86af4b1f1fda84f9d0447910256d27a8e67e90
parentd4f6cbac7044ae084467c54173f55cc0f2c416f2
Merge branch 'master' of github.com:tla/stemmatology