From: Chris Barker <barker@kappa.linguistics.fas.nyu.edu>
Date: Mon, 8 Nov 2010 20:10:37 +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?a=commitdiff_plain;h=9a35164674ce1294290002b4fc99e5cc3300eb54;hp=--cc;p=lambda.git

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

9a35164674ce1294290002b4fc99e5cc3300eb54