Merge remote-tracking branch 'origin/v0.8'
authorBen Noordhuis <info@bnoordhuis.nl>
Thu, 25 Oct 2012 14:08:58 +0000 (16:08 +0200)
committerBen Noordhuis <info@bnoordhuis.nl>
Thu, 25 Oct 2012 14:08:58 +0000 (16:08 +0200)
commit9b61f570d86f994e9677d255c8fd413f38f4fe9c
treed62da0c8f8bb8b424530b1ee395d83cf5ff8078d
parentfa94f0fe8338fcd7832a1146a4d847b27dea9a55
parent4b8629db3717a587a44b373cd10351e005b190f3
Merge remote-tracking branch 'origin/v0.8'

Conflicts:
configure
deps/v8/build/common.gypi
configure
deps/v8/build/common.gypi
lib/url.js
test/simple/test-url.js