Merge remote-tracking branch 'upstream/v0.10'
Conflicts: AUTHORS ChangeLog deps/uv/.mailmap deps/uv/ChangeLog deps/uv/build.mk deps/uv/src/unix/darwin.c deps/uv/src/unix/udp.c deps/uv/src/version.c deps/uv/test/test-list.h src/node_version.h
Please register or sign in to comment