Merge remote-tracking branch 'ry/v0.10'
authorisaacs <i@izs.me>
Sat, 25 May 2013 00:16:08 +0000 (17:16 -0700)
committerisaacs <i@izs.me>
Mon, 27 May 2013 21:46:52 +0000 (14:46 -0700)
commitba048e72b02e17f0c73e0dcb7d37e76a03327c5a
treebe9aa3f1f745db25ce2fa12116acf07ac48683cd
parent9c7078cea2b719defbb6519d10a14ab15e733822
parentf904d614bf62d4bbf9c3adffb485f84d5c77c2d8
Merge remote-tracking branch 'ry/v0.10'

Conflicts:
AUTHORS
ChangeLog
configure
deps/uv/ChangeLog
deps/uv/src/unix/darwin.c
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/v8/src/isolate.cc
deps/v8/src/version.cc
lib/http.js
src/node_version.h
15 files changed:
AUTHORS
ChangeLog
configure
doc/api/http.markdown
lib/_http_client.js
lib/_http_outgoing.js
lib/_http_server.js
lib/buffer.js
lib/net.js
lib/timers.js
lib/tls.js
src/node_buffer.cc
test/simple/test-buffer.js
test/simple/test-http-client-timeout-event.js
test/simple/test-http-upgrade-server.js