From: Chris Barker <barker@kappa.linguistics.fas.nyu.edu>
Date: Tue, 30 Nov 2010 21:32:02 +0000 (-0500)
Subject: Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=db72ac41480e82e56a4ac35fc2d710d610200486

Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
---

db72ac41480e82e56a4ac35fc2d710d610200486