From 9d8cd6d31f08f9a6a7520c3cb2c963cc817e6b18 Mon Sep 17 00:00:00 2001
From: dev_amdtel <devnull@localhost>
Date: Tue, 22 Apr 2014 21:27:53 +0400
Subject: [PATCH] merge

---
 .../ExchangeMailboxPlans.ascx.designer.cs     |  30 +-----------------
 WebsitePanel/Tools/WseClean.exe               | Bin 6144 -> 6144 bytes
 WebsitePanel/Tools/diff.exe                   | Bin 9216 -> 9216 bytes
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs
index d47492be..6ec91b6e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs
@@ -1,32 +1,4 @@
-// Copyright (c) 2014, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //
diff --git a/WebsitePanel/Tools/WseClean.exe b/WebsitePanel/Tools/WseClean.exe
index 8817a2ff43c1b47a4e5f37c668f978332c6e1475..60f8f7974e9e51f4a3d83f8d40926314e01d898e 100644
GIT binary patch
delta 828
zcmY+CUr1AN6vw~6-@Mz^?XKM|CpJabB$w0eY8GS?$;=EBmP3ZLK(k9p)*cKAd}t#f
zg}}z?4<wNVJp|Uvf+7epFoXzv5-JHHgXp0mrI%3q-Rpel!0+?>o$oone}|LS(%Q{2
z|DTQ%apY|ooY|Qja0)@*5`Sc$B%D*VK!@QU0bWX3zsJ!FID~&b1eB4V*HRCwW^0sT
zSJefPY*@P(91=8Ad6achH?LtbrFoTi$p~9jDOC&<c{i9xR^_I<^osk~2rY8m21BX4
zPc4@2UEek~H@TcD6{$g=0BXc$kH!(Ar<Rfm6j|#OaPPe!6K4V;8NmW`RU@)k?u$iX
zZ8NwdVoN6fn%v0@C1Ua%YiCxBm>f5iM<!pJTr{~VNC%|B(6rxpd=?4p5Wic=dr1_-
z0{8B%SPDKAU=O{Qj#UJ49BBk_(qxaxK9d6mX`glc)C9s}hrs|cf+2H#$Yd0^h0=i;
z!8kq&_Csc2TtKnl5Gn;nuvhRJ8rW%E#4rldM&(64z^KIbm2Su%$X-}T>$dATy>ODd
zQf+TSzvpH<##(c+$G6trlFN~yRmWk<IwGu*W*wzo2ZOC4Tp!lL^`htulIc)HIoOHq
zp5fw#GI7nQ=z>uN=!&<-Ur6tk`vTRiGt#r%1g~v3UeVu_jHb@&u|fSxG7*m@6Z)B<
zfy;WV?~*=9&y{BCa!xDr`L+@H_)P1Hk1ga%oktltUBl&77DL{$`6%$+I5uxp^w1Tt
zv+W;)(<hhCMyW*&uwK&D2Nn%7+1%wygQ#A;7@9HDes{*wh)SANL$u<alFTTLdm`$8
VdB!cdIZu@HU(Gqy`;%og+dpA?sXzb#

delta 798
zcmYk4Ur1AN6vxl+cfH#+cdxr!YO;h)gT}V5cTO-&M4efoWMm@If^1&Mw9VA{P!G)_
zFd}Ll^2O*6_)t-hj7Wlr9*pcQidfjgBqHpgKM&zUpq+bN&==0<chC7A?(cWc{iXG^
zer?M4>a?;S3d#d#B}@WPs6dOU=FI&*<!2C})67}`=EaQ9?KlSDpnQOgt?1(+Jj}MU
zcARAARBwn3(q0M<B7{)oQPzdMJizRj=G)4bOxvc4$ufXV<!j6>sZ!%KKI0yC20w7a
zW)^nb!Zx9|Vr6Z8olD6|>hyaE5OC`p0yrmB;G*Cu0!p)A1(|icglVwBCyT!=x|mtn
zX|dblu*J(3XDz<4xXN<O1|>Yluu&Wi-t(C!%s?NM(kJ8#Sq#cR0Hu1vOM(ZApc>zb
zdsq!t+Nziz8*G=3+yo73;0-YdIbsAp6L-NcV$@=%Rq3&w;}(ZtmE1A#F%8Z_fOr8S
z>?oXq2`EYfFggVZJ@zlSEKOlZlCDc1vxCJm+_`Y#>dKX6N88-V+2s4D`w%xfCh?u4
zHWK!Br^b!ZcxrUQ@OC6qiGlv{!DK=MkQqo}txnUmNIi{|foNs4!3{?<*2@iD|89l3
z?FdDh{&QLeIM~zPbG|#C@;Rl}nJ4+@5B@y-&d858#@hPhL#dHipK*L_aNIc1pD>1F
zhelJ0A)J?+<Sm6uLA{{iBgMnK*+peHLuct@RGbr4e!;Xh^g0Ug&3tV^e!T0fE#Wi<
zbN002lG9*Q*s9jB0W{RxLOm3t-BqQAX^eFgIz<HN<1p-+6vE)e88wJ`*B#O7z>Dr$
W`Tt%$yWoy;-qMs+%YU$pZvP8=!>v^S

diff --git a/WebsitePanel/Tools/diff.exe b/WebsitePanel/Tools/diff.exe
index af27fd05c9d0b7d32b94f06b76967297caa026c3..c822199fbd0368d48ee394d92b1077b6d46126a8 100644
GIT binary patch
delta 432
zcmZqhXz-ZO!D8?26Fjj;hB0sA%5XjzO9lpi1|V=?VEDi~QBjyDfq{Vs$bVwaz#ubO
zkx6HAB%?ZG$>c`Hdd7gsj7-8jNB9{S7=bF785r0m7fKmy4q!6iV7#!okxP?BcoLHy
zLp8%(Alb~Y3`lk}te?D>PnMMlq-FDcK2;6@3+=X##YSz8E3Ct1kAzKi-Yg=X&BSOj
zxj|A^$Vksn&p^+Rfq{#WffdY|yhPH%fdS-Zpp^_vKr92Y+yaQD7#M<rU4lQi$xhqa
z!{#tG=OhPj=FVu4bh1^9bAC!{Ku&5!On7j>WEH756Ad_dU4XuYfw;-C($Z`JV3EmI
z(nluq$&|^)06hf<E({E>K!!m<%;beK`uvPQH-H2|G!RU_FO$f)XR@QLGUJTNsj`nb
zjTrP841w5Sa-du-&{yZ>jxrkn18TawB9h!ud2K<sO0W)~S)2dLb2Bj&SZ)?nde1n~
GfE@rev|LR9

delta 430
zcmZqhXz-ZO!LsC_S-`{|8OFGYE5rE&EEyQQ8Gyinf#Cz|L`7kq1O^5kApeFr1B1+D
zMJAoek&Nn$DU%x+>lqy;GcpPD?BHi$U<9gQW?*2OTqtF*Ie^K4gYn4bMlMYj;Z`O+
zhH8dMK(d)(HjwOQSTcDppDZgQ0}}(&=KFlA90Jbw-pFkWY4%^iD^?<FZ^^h>L_C{`
z(P(mmq%6Cko)HilPF^o*;Q?|d&>Emdpi6)jegV4ZizEX>P_Rod4`0aBKD|Kyj*3kE
z#ZQG<K<-JliU}yn&q_@$DUJzGO)AbTNexKMOU;?AF7-yp0_aZ|@B^_GCMt?CIap5i
zl0Guofl**GpG=u-0?<ov;KIQ03S=x4Buri?qtDL-^f}lo5PI@`nMB3|lO1K18Rtw+
zm3_=<$e_ny1j3U8<!XU`IxlyW*@S^(@^pDcUbq}k-f;3kd2LjY&41;&nV1qRHw!Ag
JXPjuj4glqRVEO<6