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

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

a2836827f3ba40c4bd1fa3b8308f852405d79cee