From: Chris Barker <barker@kappa.(none)>
Date: Mon, 4 Oct 2010 00:37:14 +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=bea2932d9f91273c294112b7c896229fa7398158;hp=--cc

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

bea2932d9f91273c294112b7c896229fa7398158