Merge pull request #3766 from borysf/master

Sublimerge packages uses HTTPS

channel.json

@@ -4,7 +4,6 @@
 		"./repository.json",
 		"http://release.latexing.com/packages.json",
 		"http://www.sublimegerrit.com/packages.json",
-		"http://www.sublimerge.com/packages.json",
 		"https://bitbucket.org/jjones028/p4sublime/raw/tip/packages.json",
 		"https://bitbucket.org/klorenz/sublime_packages/raw/tip/packages.json",
 		"https://raw.githubusercontent.com/accerqueira/sublime/master/packages.json",
@@ -129,6 +128,7 @@
 		"https://raw.githubusercontent.com/zfkun/sublime-kissy-snippets/master/packages.json",
 		"https://release.sublimegit.net/packages.json",
 		"https://sublime.wbond.net/packages_2.json",
+		"https://sublimerge-bfcloud.rhcloud.com/packages.json",
 		"https://wuub.net/packages.json"
 	]
 }