Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda
authorChris Barker <barker@omega.(none)>
Sat, 4 Dec 2010 16:35:41 +0000 (11:35 -0500)
committerChris Barker <barker@omega.(none)>
Sat, 4 Dec 2010 16:35:41 +0000 (11:35 -0500)
commit3b908cb0f0b83c55ea4e336f80ecc273a87d128f
treee473c3274dd06362e784ad6b620f0ebaebb5d6e9
parent0c843ed2f741748d662a8eaea08c5e95061486fe
parenta9bcd94f06158cf67f3b7bb5f0abaf63050d23eb
Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda