Merge remote-tracking branch 'upstream/v0.10' into v0.12

Conflicts:
	ChangeLog
	Makefile
	deps/uv/ChangeLog
	deps/uv/build.mk
	deps/uv/src/unix/darwin.c
	deps/uv/src/unix/getaddrinfo.c
	deps/uv/src/version.c
	deps/v8/src/checks.h
	deps/v8/src/isolate.h
	lib/cluster.js
	lib/module.js
	lib/timers.js
	lib/tls.js
	src/node_version.h

1 files changed, 4 insertions, 4 deletions

diff --git a/deps/npm/node_modules/github-url-from-username-repo/test/index.js b/deps/npm/node_modules/github-url-from-username-repo/test/index.js
index e8e7b47600..14c7dd16c2 100644
--- a/deps/npm/node_modules/github-url-from-username-repo/test/index.js
+++ b/deps/npm/node_modules/github-url-from-username-repo/test/index.js
@@ -4,7 +4,7 @@ var getUrl = require("../")
 describe("github url from username/repo", function () {
   it("returns a github url for the username/repo", function () {
     var url = getUrl("visionmedia/express")
-    assert.equal("git://github.com/visionmedia/express", url)
+    assert.equal("https://github.com/visionmedia/express", url)
   })
 
   it("returns null if it does not match", function () {
@@ -19,16 +19,16 @@ describe("github url from username/repo", function () {
 
   it("works with .", function () {
     var url = getUrl("component/downloader.js")
-    assert.equal("git://github.com/component/downloader.js", url)
+    assert.equal("https://github.com/component/downloader.js", url)
   })
 
   it("works with . in the beginning", function () {
     var url = getUrl("component/.downloader.js")
-    assert.equal("git://github.com/component/.downloader.js", url)
+    assert.equal("https://github.com/component/.downloader.js", url)
   })
 
   it("works with -", function () {
     var url = getUrl("component/-dow-nloader.j-s")
-    assert.equal("git://github.com/component/-dow-nloader.j-s", url)
+    assert.equal("https://github.com/component/-dow-nloader.j-s", url)
   })
 })