From: Chris Barker <barker@kappa.(none)>
Date: Sun, 26 Sep 2010 21:59:33 +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=bd9306cd8ed960db37717c40573e8230a9dd65bf

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

bd9306cd8ed960db37717c40573e8230a9dd65bf