From: Chris Barker <barker@kappa.(none)>
Date: Sat, 18 Sep 2010 13:43:54 +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=ec88fb91f1b5d87fe9d4636d7a0b29bda7146142;hp=--cc

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

ec88fb91f1b5d87fe9d4636d7a0b29bda7146142