From: Chris Barker <barker@omega.(none)>
Date: Sat, 27 Nov 2010 04:45:10 +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=ef15f2c1e2c9c82e41b64d9d11a3301e225ea331

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

ef15f2c1e2c9c82e41b64d9d11a3301e225ea331