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)
commitbea2932d9f91273c294112b7c896229fa7398158
tree0bf1849fb765863e09e803e0b292e950f94ae68e
parentd7c9144dc2558e867db336c1c36961fb0d19fdad
parent5a235579e3764fed888bdbd8465c373634c63984
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda