Conflicts: AUTHORS ChangeLog deps/uv/ChangeLog deps/uv/build.mk deps/uv/config-unix.mk deps/uv/include/uv-private/uv-win.h deps/uv/src/unix/async.c deps/uv/src/unix/process.c deps/uv/src/version.c deps/uv/src/win/poll.c deps/uv/test/test-list.h deps/uv/uv.gyp lib/http.js src/node.js src/node_version.h