From: Chris Barker <barker@omega.(none)>
Date: Sat, 27 Nov 2010 04:44:00 +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?a=commitdiff_plain;ds=inline;h=48a42d03d6e2562628e1ab9cc7e134cc9bcf4294;p=lambda.git

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

48a42d03d6e2562628e1ab9cc7e134cc9bcf4294