From: Chris Barker <barker@kappa.linguistics.fas.nyu.edu>
Date: Wed, 8 Jun 2011 18:16:31 +0000 (-0400)
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=700ff894efd420fcad75b9215ab8c54e8fc14a3f

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

700ff894efd420fcad75b9215ab8c54e8fc14a3f