Conflicts: AUTHORS ChangeLog deps/uv/ChangeLog deps/uv/include/uv-darwin.h deps/uv/src/unix/darwin.c deps/uv/src/unix/fsevents.c deps/uv/src/version.c lib/_stream_writable.js src/node_version.h