Merge branch 'v0.8'
authorBert Belder <bertbelder@gmail.com>
Tue, 28 Aug 2012 00:54:22 +0000 (02:54 +0200)
committerBert Belder <bertbelder@gmail.com>
Tue, 28 Aug 2012 00:54:22 +0000 (02:54 +0200)
commitbf16d9280ea7aadce5c5437184c1d80e651a997a
tree85c570a9c80181c9bd84ce8bcc726d644daa36db
parent4822d780bb913c9ef7c2301a181a5834887cddb4
parent24184345688e1f545ffc87e5742de06ed9855007
Merge branch 'v0.8'

Conflicts:
ChangeLog
deps/openssl/openssl.gyp
src/node_version.h
AUTHORS
ChangeLog
common.gypi
deps/openssl/openssl.gyp
lib/child_process.js
lib/net.js
lib/tls.js