Merge remote-tracking branch 'origin/v0.8'
authorBen Noordhuis <info@bnoordhuis.nl>
Sat, 2 Mar 2013 22:13:35 +0000 (23:13 +0100)
committerBen Noordhuis <info@bnoordhuis.nl>
Sat, 2 Mar 2013 22:13:35 +0000 (23:13 +0100)
commit2d51036fb9655d5b775e7f9e5ab362cd91460ca3
tree73bae06f6965d2ff3379e092b3d5b79f47ada6b5
parent4ac73d2c99a4987c62465c7aa7b0bdd13d2c085e
parent426cbedb44e1dfff645b9f275f7b27a389dc86b0
Merge remote-tracking branch 'origin/v0.8'

Conflicts:
doc/api/http.markdown
test/simple/test-crypto.js
doc/api/http.markdown
lib/http.js
src/node_crypto.cc
test/simple/test-crypto.js
test/simple/test-dgram-pingpong.js