From: Chris Barker <barker@omega.(none)>
Date: Mon, 6 Dec 2010 12:21:36 +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=ff95f5a38d61a6fa0b9c5e4da4253a6a3266a7dc;hp=ff95f5a38d61a6fa0b9c5e4da4253a6a3266a7dc

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