Merge remote-tracking branch 'ry/v0.8' into master
authorisaacs <i@izs.me>
Thu, 19 Jul 2012 20:06:46 +0000 (13:06 -0700)
committerisaacs <i@izs.me>
Thu, 19 Jul 2012 20:06:46 +0000 (13:06 -0700)
Conflicts:
src/node_version.h

1  2 
doc/api/process.markdown

Simple merge