Merge remote-tracking branch 'origin/v0.8'
authorBen Noordhuis <info@bnoordhuis.nl>
Wed, 4 Jul 2012 11:41:56 +0000 (13:41 +0200)
committerBen Noordhuis <info@bnoordhuis.nl>
Wed, 4 Jul 2012 11:41:56 +0000 (13:41 +0200)
commit41b129fbde966058d22f5dbdc64125bc30a6af62
treea4208e7a954911c7811f13b5c6c71666dacd4e89
parentfee02db705152a42c8db442d3ab76b2296e59bbd
parentfc4e12b8f1d6e3ea010d575504011deee2a97b16
Merge remote-tracking branch 'origin/v0.8'

Conflicts:
configure
src/node_version.h
doc/index.html