Merge remote-tracking branch 'ry/v0.6' into master
authorisaacs <i@izs.me>
Wed, 1 Feb 2012 02:18:00 +0000 (18:18 -0800)
committerisaacs <i@izs.me>
Wed, 1 Feb 2012 02:18:00 +0000 (18:18 -0800)
commit18d179c2d8f916c07a763ea8e99ed6dc77751bfa
treed2066d272d5e81f21c355e0ab9b6432dcebd3c5f
parent33b7fc250f061af42b595decf6c0edf360c5aae9
parent7e0bf7d57de318f45a097e05644efa49beb65209
Merge remote-tracking branch 'ry/v0.6' into master

Conflicts:
ChangeLog
deps/uv/src/unix/udp.c
deps/uv/src/win/fs.c
deps/uv/src/win/udp.c
deps/uv/test/test-fs.c
doc/index.html
doc/logos/index.html
doc/template.html
src/node_version.h
15 files changed:
ChangeLog
Makefile
deps/uv/include/uv.h
deps/uv/src/unix/error.c
deps/uv/src/unix/pipe.c
deps/uv/src/unix/udp.c
deps/uv/src/win/udp.c
deps/uv/test/test-fs.c
deps/uv/test/test-ipc-threads.c
deps/uv/test/test-list.h
deps/uv/uv.gyp
lib/http.js
lib/module.js
src/node.js
src/udp_wrap.cc