Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:44:00 +0000 (23:44 -0500)
committerChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:44:00 +0000 (23:44 -0500)
commit48a42d03d6e2562628e1ab9cc7e134cc9bcf4294
treeae34ccc67075a3d4d40cab17261300910387613e
parent3d53131298c479c56d95be8c6d2b62127cac087d
parentdfd299634e576bfe075da7863a91327ec6c3d31f
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda