From: Chris Barker <barker@kappa.(none)>
Date: Sat, 18 Sep 2010 13:33:20 +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=5e6821b688eb5917ac5477c9b8df251b9637a693;hp=5e6821b688eb5917ac5477c9b8df251b9637a693

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