Merge remote-tracking branch 'ry/v0.8'
authorisaacs <i@izs.me>
Fri, 3 Aug 2012 23:23:14 +0000 (16:23 -0700)
committerisaacs <i@izs.me>
Fri, 3 Aug 2012 23:23:14 +0000 (16:23 -0700)
commit3bf1846bb7653af718d8d5bf4e75d904b2ac285f
treeff06f5873e27750f2e2af37f7019d00f3f9bf814
parentc05f52c254a070f8b58f12b37687d4e40a0edb8e
parent5fdeebd94d58bf715d991d5bc63be6fff507f27d
Merge remote-tracking branch 'ry/v0.8'

Conflicts:
ChangeLog
deps/uv/src/unix/sunos.c
deps/uv/test/test-tcp-unexpected-read.c
src/node_version.h
AUTHORS
ChangeLog
deps/uv/include/uv-private/uv-unix.h
deps/uv/include/uv.h
deps/uv/src/unix/thread.c
deps/uv/test/test-list.h
deps/uv/test/test-tcp-unexpected-read.c
lib/net.js
src/node.cc
src/node.h
src/node.js