From 344ea5e4bd1666bf5bf6901112e548b990dc08e5 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 30 Oct 2012 08:11:05 -0400
Subject: [PATCH 1/2] Merge

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

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 27a5f82b..3766094f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,19 +5,11 @@
   </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>
-    <!-- A1D4KDHUE83NKHddF -->
-    <!--
-    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
-    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
-    -->
-    <add key="WebsitePanel.CryptoKey" value="fr2ym4wn2gmbrj7dz336" />
+    <!-- Encryption util settings -->
+    <add key="WebsitePanel.CryptoKey" value="1234567890" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->

From 4b457fc8c6dd3a7e8865dd7a98f6e7b6edd0d2ac Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Tue, 30 Oct 2012 08:20:39 -0400
Subject: [PATCH 2/2] Added tag build-2.0.0.145 for changeset c0c9007136a5