Merge remote-tracking branch 'origin/v0.8'
authorBen Noordhuis <info@bnoordhuis.nl>
Thu, 20 Dec 2012 11:39:04 +0000 (12:39 +0100)
committerBen Noordhuis <info@bnoordhuis.nl>
Thu, 20 Dec 2012 11:39:04 +0000 (12:39 +0100)
1  2 
lib/http.js
tools/install.py

diff --cc lib/http.js
Simple merge
Simple merge