Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:49:06 +0000 (23:49 -0500)
committerChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:49:06 +0000 (23:49 -0500)
commita2836827f3ba40c4bd1fa3b8308f852405d79cee
tree725a69f8096bc6932abea9bd1bc96bacf55102ed
parentd522d89b44b4ea898f8089ea2d2c7ec8384770de
parenteb2fa58d13fb86ca9ae981a85864374df7d864a7
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda