Conflicts: AUTHORS ChangeLog deps/uv/test/runner-win.c doc/api/process.markdown lib/repl.js src/node_crypto.cc src/node_version.h