Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.(none)>
Sun, 26 Sep 2010 21:59:33 +0000 (17:59 -0400)
committerChris Barker <barker@kappa.(none)>
Sun, 26 Sep 2010 21:59:33 +0000 (17:59 -0400)
commitbd9306cd8ed960db37717c40573e8230a9dd65bf
tree0143274b228d38fa4a0d03c36d194136497a94bf
parenta8f9da95c22c7bf21df81404cd9c3f5b2e73e6a7
parentdd6927b2e9873cc5adb6a2407ecb7bd4490de5dd
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda