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)
Conflicts:
configure
src/node_version.h

1  2 
doc/index.html

diff --cc doc/index.html
Simple merge