Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 17:16:03 +0000 (13:16 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 17:16:03 +0000 (13:16 -0400)
commit3ac14d0e0a390c3afae43fa5664e8a69c769377a
tree33ecee7c90ba05ef0cf2ae84389cdb8f8bcba4d1
parent84c990df494e32b8099d76bc58dd2a2e560da0d6
parentd8be476da34a56b5c268b2dbe62f93b0378eefca
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
alpha.mdwn