Merge remote branch 'origin/v0.6'
authorRyan Dahl <ry@tinyclouds.org>
Fri, 16 Dec 2011 21:57:36 +0000 (13:57 -0800)
committerRyan Dahl <ry@tinyclouds.org>
Fri, 16 Dec 2011 21:57:36 +0000 (13:57 -0800)
commit1865b11dcb77b452ef84fac6970cc742b387dfab
tree4f7a6fd12041fc0598606188d68a1b036701bd70
parent67e12a0f84eb16bab804a6dde88154d66da9dba3
parenta599aeb2a8159c48eafbe066466ea5bc90d0c71c
Merge remote branch 'origin/v0.6'

Conflicts:
wscript
Makefile
src/node_crypto.cc
src/node_file.cc
test/simple/test-crypto.js