Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Mon, 13 Jan 2014 22:56:12 +0000 (14:56 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Mon, 13 Jan 2014 22:56:12 +0000 (14:56 -0800)
commit429b58701a452703a161ed5e875b07268c909873
tree05097712c83482cd68b55291396489cf8a03adba
parentec57ecc982df6d4677fc5a347738201effeae5d1
parent1b74892807887fe89828ab874e9ce6b2831e7d54
Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
deps/uv/ChangeLog
deps/uv/build.mk
deps/uv/src/version.c
deps/uv/test/test-ipc.c
deps/v8/src/objects.cc
src/node.cc
src/node_os.cc
doc/api/cluster.markdown
doc/api/stream.markdown
lib/_stream_writable.js
src/node.cc
src/node_os.cc
test/simple/test-abort-fatal-error.js
test/simple/test-debugger-client.js