Merge remote-tracking branch 'remotes/origin/6.7' into 6.8

Author: Gabriela Martinez

MySQLClient-VS2012.sln

@@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Replication.Tests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests.Stress", "Tests\MySql.Data.Tests.Stress\MySql.Data.Tests.Stress.csproj", "{2D442A7A-B938-4168-A736-21A41CAD5DD2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.ConnectorInstaller", "Source\MySql.ConnectorInstaller\MySql.ConnectorInstaller.csproj", "{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -324,6 +326,34 @@ Global
 		{2D442A7A-B938-4168-A736-21A41CAD5DD2}.ReleaseEF6|Mixed Platforms.Build.0 = ReleaseEF6|Any CPU
 		{2D442A7A-B938-4168-A736-21A41CAD5DD2}.ReleaseEF6|x64.ActiveCfg = ReleaseEF6|Any CPU
 		{2D442A7A-B938-4168-A736-21A41CAD5DD2}.ReleaseEF6|x86.ActiveCfg = ReleaseEF6|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.DebugEF6|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.DebugEF6|Any CPU.Build.0 = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.DebugEF6|ARM.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.DebugEF6|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.DebugEF6|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.DebugEF6|x64.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.DebugEF6|x86.ActiveCfg = Debug|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Release|x64.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.ReleaseEF6|Any CPU.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.ReleaseEF6|Any CPU.Build.0 = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.ReleaseEF6|ARM.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.ReleaseEF6|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.ReleaseEF6|Mixed Platforms.Build.0 = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.ReleaseEF6|x64.ActiveCfg = Release|Any CPU
+		{CDB0903E-AC9C-409D-B5FE-3D30F31E14EB}.ReleaseEF6|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE