Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:45:10 +0000 (23:45 -0500)
committerChris Barker <barker@omega.(none)>
Sat, 27 Nov 2010 04:45:10 +0000 (23:45 -0500)
commitef15f2c1e2c9c82e41b64d9d11a3301e225ea331
treea2b71cae4aace102ed37699fa7753805bb59cc1a
parent3872c08aca60c2a70b0bff50e0ed7ca8290a8865
parenta3825219f85a2f0ff02ef5edc1fb6504eec634f2
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda