Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.(none)>
Sat, 18 Sep 2010 13:33:20 +0000 (09:33 -0400)
committerChris Barker <barker@kappa.(none)>
Sat, 18 Sep 2010 13:33:20 +0000 (09:33 -0400)
commit5e6821b688eb5917ac5477c9b8df251b9637a693
tree4553929f084482846fdbc7ec1ed56e7d87c2acea
parent87eee898644d0a230dddc852e659aa6ac08b85f1
parent177216b49df3d97150074235cd8d9e8996d46b32
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda