Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Tue, 30 Nov 2010 21:32:02 +0000 (16:32 -0500)
committerChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Tue, 30 Nov 2010 21:32:02 +0000 (16:32 -0500)
commitdb72ac41480e82e56a4ac35fc2d710d610200486
treece80815c3f1aaa0de8205590635ac5a8a22ea45d
parent9c7ca26e6dd0c1ce1b6cd653e27a083b7379a5dd
parent59118d5259b0f1d3697a28de74089aec622e5476
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda