Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@kappa.(none)>
Mon, 4 Oct 2010 00:37:14 +0000 (20:37 -0400)
committerChris Barker <barker@kappa.(none)>
Mon, 4 Oct 2010 00:37:14 +0000 (20:37 -0400)

Trivial merge