Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:46:49 +0000 (23:46 -0500)
committerChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:46:49 +0000 (23:46 -0500)
commitfa335a201b26e6100c34f4f178bc10cd3249220f
tree4986f733ec0aee853b80b280a9418269d9cb54d4
parentaeec785e1d00c613973b4912d4b0f510954491ec
parentc300cc82d80c40f41a279711fc9c00b06137df60
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda