Merge branch 'v0.6'
authorBert Belder <bertbelder@gmail.com>
Fri, 25 Nov 2011 11:34:29 +0000 (12:34 +0100)
committerBert Belder <bertbelder@gmail.com>
Fri, 25 Nov 2011 11:34:29 +0000 (12:34 +0100)
commitcffd0bb68d4b72601539b1f3cf2b7ff50def897c
tree62539cdb6040f8ce1d3bdd85c2a0a83c9ade7371
parent1db9a2adbe5e2509d9fea9299835fc120ad6ba2b
parentb159c6d62e5756d3f8847419d29c6959ea288b56
Merge branch 'v0.6'

Conflicts:
Makefile
src/node_version.h
test/simple/test-http-response-no-headers.js
deps/uv/include/uv.h
deps/uv/src/unix/internal.h
src/node_version.h