Merge branch 'master' into Cyberboss-patch-1

TGServerService/ServerInstance/Repository.cs

@@ -900,9 +900,6 @@ namespace TGServerService
 
 					currentProgress = -1;
 
-					var Config = Properties.Settings.Default;
-
-
 					branch = Repo.Branches[LocalBranchName];
 					if (branch == null)
 					{
@@ -931,7 +928,7 @@ namespace TGServerService
 					}
 
 					//so we'll know if this fails
-					var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Testmerge commit for pull request #{0}", PRNumber));
+					var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Config.Name));
 
 					if (Result == null)
 						try