Conflicts: ChangeLog deps/uv/AUTHORS deps/uv/ChangeLog deps/uv/src/unix/linux-core.c deps/uv/src/version.c deps/uv/src/win/timer.c lib/url.js src/node_version.h test/simple/test-url.js