From: Chris Barker <barker@kappa.linguistics.fas.nyu.edu>
Date: Tue, 30 Nov 2010 21:14:15 +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=339b62e48b39fadd325d9e0dc903430c4a896870;ds=sidebyside

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

339b62e48b39fadd325d9e0dc903430c4a896870