From: Chris Barker <barker@kappa.linguistics.fas.nyu.edu>
Date: Tue, 30 Nov 2010 20:32:22 +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=767dc2f1f56176d59b16840613d6c0b170a229f3

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

767dc2f1f56176d59b16840613d6c0b170a229f3