From: Chris Barker <barker@omega.(none)>
Date: Sat, 4 Dec 2010 16:35:41 +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=3b908cb0f0b83c55ea4e336f80ecc273a87d128f

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

3b908cb0f0b83c55ea4e336f80ecc273a87d128f