Merge remote-tracking branch 'ry/v0.10'
authorisaacs <i@izs.me>
Wed, 5 Jun 2013 20:38:38 +0000 (13:38 -0700)
committerisaacs <i@izs.me>
Wed, 5 Jun 2013 20:38:38 +0000 (13:38 -0700)
commit0882a7506394e07ae6564ccf3db401b8fb7f7071
tree0fa2a931b2f7953d06203aa63308de7ac75f602a
parenta7820a15e7eb4e57a4fe2f076e877dcc6069358c
parente0519ace315c7ce14278d5eaab8d1d72a0a0a054
Merge remote-tracking branch 'ry/v0.10'

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
ChangeLog
lib/net.js
lib/url.js
test/simple/test-url.js