From: Chris Barker Date: Sun, 3 Oct 2010 18:33:30 +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=0a6cb8dd4a9460b13006f75f6a5b84d434aba212 Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda --- 0a6cb8dd4a9460b13006f75f6a5b84d434aba212