# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1231785057 0
# Node ID fb0340112a649985cf1fdd6794df59e1d78e0fb3
# Parent  f080f47565dbd47deff9d18c8c708ffd1a35b22a# Parent  6bee94ca522abf647d1e55459c4004a398db5578
merge of '74c268c89bbcb796bd93e892d622370cf996ae77'
     and '86f401028e5edbd8613c5d956c9158234da40670'

diff -r f080f47565db -r fb0340112a64 ChangeLog
--- a/ChangeLog	Mon Jan 12 04:45:22 2009 +0000
+++ b/ChangeLog	Mon Jan 12 18:30:57 2009 +0000
@@ -12,6 +12,10 @@
 	* Fix the hang on exit in Network Location Awareness for Windows XP
 	  and Windows Vista. (Paul Aurich)
 
+	MSN:
+	* Change Contact Server to temporarily fix connection problems.
+	  (Thanks to Youness Alaoui)
+
 	XMPP:
 	* Support for XEP-0191 blocking.  (Vijay Raghunathan)
 	* Don't put SASL PLAIN or IQ Auth passwords in debug logs. (Paul Aurich)
diff -r f080f47565db -r fb0340112a64 libpurple/protocols/msn/contact.h
--- a/libpurple/protocols/msn/contact.h	Mon Jan 12 04:45:22 2009 +0000
+++ b/libpurple/protocols/msn/contact.h	Mon Jan 12 18:30:57 2009 +0000
@@ -30,7 +30,7 @@
 
 #define MSN_APPLICATION_ID "CFE80F9D-180F-4399-82AB-413F33A1FA11"
 
-#define MSN_CONTACT_SERVER	"contacts.msn.com"
+#define MSN_CONTACT_SERVER	"omega.contacts.msn.com"
 
 /* Get Contact List */