From: Chris Barker <barker@omega.(none)>
Date: Sun, 28 Nov 2010 03:26:50 +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=fc2cec698d708b9baab616cbedfbd4481c4057cd

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

fc2cec698d708b9baab616cbedfbd4481c4057cd