From: Chris Barker <barker@kappa.linguistics.fas.nyu.edu>
Date: Mon, 6 Dec 2010 20:06:25 +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=8f067600295d47935d4ec86e612c189d0e39b0d7

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

8f067600295d47935d4ec86e612c189d0e39b0d7