From 0137fe60d0cc2a31dd521153814b89a6ff5ac532 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Thu, 18 Oct 2012 04:36:01 -0400
Subject: [PATCH 1/2] Merge

---
 .../WebsitePanel.EnterpriseServer/Web.config        | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 7419631a..3766094f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,19 +5,12 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-    <!--
-    <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
-    <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
-    -->
-    <add name="EnterpriseServer" connectionString="server=HSTWSP01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=pserxfbnlc6hwmdedbp0;" providerName="System.Data.SqlClient" />
+        <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
+    <!-- Encryption util settings -->
+    <add key="WebsitePanel.CryptoKey" value="1234567890" />
     <!-- A1D4KDHUE83NKHddF -->
-    <!--
-    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
-    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-    -->
-    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />  <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->
     <add key="WebsitePanel.EnterpriseServer.WebApplicationsPath" value="~/WebApplications" />

From 7c4bb1ae9fea6b6f2c4ae75d1335f32998ceadc5 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Thu, 18 Oct 2012 04:55:55 -0400
Subject: [PATCH 2/2] Added tag build-2.0.0.115 for changeset 350ad8f3e288