Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Mon, 8 Nov 2010 20:10:37 +0000 (15:10 -0500)
committerChris Barker <barker@kappa.linguistics.fas.nyu.edu>
Mon, 8 Nov 2010 20:10:37 +0000 (15:10 -0500)
commit9a35164674ce1294290002b4fc99e5cc3300eb54
tree47b9c34b63cfe0bc041e9960134c1a009b4d56e8
parent0c9310c3707526f77e7d72c0ae932b1d6290e773
parent87950b9337d05be3815445fb900d3b65d65b89b9
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda