From 7b5c1e07cc9653009d26a201cb9ca9747d693bff Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE913.europe.corp.microsoft.com>
Date: Sun, 23 Sep 2012 16:03:21 +0400
Subject: [PATCH] merge commit

---
 WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln    | 1 -
 .../DesktopModules/WebsitePanel/Login.ascx                | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
index f28eaeef..36ca6285 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln
@@ -2,7 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C57D3F9F-7BA0-4D38-A159-B6EDA5C19B13}"
 	ProjectSection(SolutionItems) = preProject
-		..\Database\install_db.sql = ..\Database\install_db.sql
 		..\..\LICENSE.txt = ..\..\LICENSE.txt
 		..\..\Readme.htm = ..\..\Readme.htm
 		..\..\ReleaseNotes.htm = ..\..\ReleaseNotes.htm
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx
index b964b27e..fa7f338c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx
@@ -45,6 +45,14 @@
 				<asp:DropDownList ID="ddlTheme" runat="server" CssClass="NormalTextBox" Width="150px" AutoPostBack="True" OnSelectedIndexChanged="ddlTheme_SelectedIndexChanged"></asp:DropDownList>
 			</td>
 		</tr>
+		<tr>
+			<td class="SubHead" align="right"></td>
+
+			<td class="Normal" align="left">
+            <a  href="https://mail.duhosting.ae" style="text-decoration:none">Click here to access your WebMail</a>
+			</td>
+		</tr>
+
 	</table>
 	<br />
 </div>
\ No newline at end of file