From: Chris Barker <barker@omega.(none)>
Date: Sat, 27 Nov 2010 04:46:49 +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=fa335a201b26e6100c34f4f178bc10cd3249220f;hp=-c

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

fa335a201b26e6100c34f4f178bc10cd3249220f