Merge branch 'master' of git://github.com/rscherf/package_control_channel into rscherf-master

Conflicts:
	repository/g.json

repository/g.json

@@ -381,16 +381,6 @@
 				}
 			]
 		},
-		{
-			"name": "GitHubLink",
-			"details": "https://github.com/rscherf/GithubLink",
-			"releases": [
-				{
-					"sublime_text": "*",
-					"tags": true
-				}
-			]
-		},
 		{
 			"name": "Gitignore",
 			"details": "https://github.com/kevinxucs/Sublime-Gitignore",
@@ -422,6 +412,17 @@
 				}
 			]
 		},
+		{
+			"name": "GitLink",
+			"details": "https://github.com/rscherf/GitLink",
+			"previous_names": ["GitHubLink"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "gitp",
 			"details": "https://github.com/subsetpark/gitp",