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)
commit3c998945aad4e5295452747c96f48a222e7b62f8
tree843dfc6ee350ea1bd8232c4484a61906b4ebfe19
parent430d94ef85f2786522671317ccbd034ef921ae14
parentd9057cc090b8e98fa35533ccf61ec3bfd7002955
Merge remote-tracking branch 'ry/v0.8' into master

Conflicts:
src/node_version.h
doc/api/process.markdown