Merge branch 'v0.6'
authorBert Belder <bertbelder@gmail.com>
Sat, 28 Apr 2012 22:17:23 +0000 (00:17 +0200)
committerBert Belder <bertbelder@gmail.com>
Sat, 28 Apr 2012 22:17:23 +0000 (00:17 +0200)
commitc8a10e97c8def4c6a89f34f655b675d4204e16d4
tree1a58158024b406ac4072fe8c4bd8cb70c4e79ce0
parentab072ee41693ee95667a06bce86588242c5b5869
parentdb844b152a92bcc02c20e62ea85958c0f3dfc532
Merge branch 'v0.6'

Conflicts:
deps/uv/include/uv-private/uv-unix.h
deps/uv/include/uv-private/uv-win.h
deps/uv/src/uv-common.c
deps/uv/src/win/fs.c
src/process_wrap.cc
common.gypi
doc/api/child_process.markdown
lib/child_process.js
src/process_wrap.cc