Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Wed, 8 Jun 2011 18:16:31 +0000 (14:16 -0400)
committerChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Wed, 8 Jun 2011 18:16:31 +0000 (14:16 -0400)
commit700ff894efd420fcad75b9215ab8c54e8fc14a3f
tree30981bb90a26bd9ede5b0c049146222a54e241e5
parent1e593fe87c53f0f023e26f9c82665808b42640d4
parent9a815152fb9ad1fa4ee5778376dc59007cc687f3
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda