Merge remote-tracking branch 'ry/v0.10' into master
authorisaacs <i@izs.me>
Fri, 17 May 2013 20:04:02 +0000 (13:04 -0700)
committerisaacs <i@izs.me>
Fri, 17 May 2013 21:04:54 +0000 (14:04 -0700)
commit61c9f78c639459f28eea3d1de203b92debd9f513
tree72e6860c814a59075d8d61c0e8fff458db7925e0
parent79988438078f58f828811ec87394700ccef42293
parentf59ab10a6415e7dce7a6c3b6e734c213298ec205
Merge remote-tracking branch 'ry/v0.10' into master

Conflicts:
AUTHORS
ChangeLog
deps/uv/ChangeLog
deps/uv/config-unix.mk
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/uv/uv.gyp
src/node.cc
src/node_buffer.cc
src/node_crypto.cc
src/node_version.h
src/stream_wrap.cc
src/stream_wrap.h
16 files changed:
AUTHORS
ChangeLog
doc/api/fs.markdown
doc/api/stream.markdown
lib/_stream_transform.js
lib/_stream_writable.js
lib/crypto.js
lib/net.js
node.gyp
src/node.cc
src/node_buffer.cc
src/node_crypto.cc
src/stream_wrap.cc
src/stream_wrap.h
src/string_bytes.cc
test/simple/test-buffer.js