Merge remote-tracking branch 'origin/v0.6'
authorBen Noordhuis <info@bnoordhuis.nl>
Thu, 29 Dec 2011 00:49:10 +0000 (01:49 +0100)
committerBen Noordhuis <info@bnoordhuis.nl>
Thu, 29 Dec 2011 00:49:10 +0000 (01:49 +0100)
commitbc7bae1d6be616b290e644ac3e2e403b29e199c1
tree9844243a61afc12ec565af3a18a13c651bbf6855
parentb7c05e1b75e5c64d53b7b0877791ce001020f671
parent448c5e07ca594399f3d3f93ea6f97124ea56af95
Merge remote-tracking branch 'origin/v0.6'

Conflicts:
src/platform_win32.cc
doc/api/child_processes.markdown
doc/api/process.markdown
lib/http.js
src/node_http_parser.cc