Merge remote-tracking branch 'origin/v0.8'
authorBen Noordhuis <info@bnoordhuis.nl>
Sun, 21 Oct 2012 21:06:48 +0000 (23:06 +0200)
committerBen Noordhuis <info@bnoordhuis.nl>
Sun, 21 Oct 2012 21:06:48 +0000 (23:06 +0200)
commitd0227b03083a0edceb34ff55aabe4a6efde8b21c
treedbc7d242b589494b8b4cb61dc607cb0164808d15
parent72ce9baa75434f64e42ee4e666897ddfd754c822
parent627f0d27e827295cf8e7442b89d4fc5708ef5d8d
Merge remote-tracking branch 'origin/v0.8'

Conflicts:
deps/openssl/openssl.gyp
deps/openssl/openssl.gyp
deps/openssl/openssl/crypto/ui/ui_openssl.c
doc/api/crypto.markdown
doc/api/fs.markdown