# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1329987672 0
# Node ID f9650f6b636da0c40d6c678316d51f2774170d9a
# Parent  cebed34f92ebc5d97f7e96aa297e949680d2dc0c# Parent  3f81e3c3064c9a29597b01cca6969a01d984151d
merge of 'd3c4fbebab720da0885766add6272f14814edc99'
     and 'deb06ab6aa118efb674f1a8434ff529e67b28809'

diff -r 3f81e3c3064c -r f9650f6b636d ChangeLog
--- a/ChangeLog	Thu Feb 23 08:12:03 2012 +0000
+++ b/ChangeLog	Thu Feb 23 09:01:12 2012 +0000
@@ -24,8 +24,6 @@
 	MSN:
 	* Fix file transfer with older Mac MSN clients.
 	* Support file transfers up to ~9 EiB.
-	* Support new protocol version MSNP18. (#14753)
-	* Fix messages to offline contacts. (#14302)
 
 	MXit:
 	* Remove all reference to Hidden Number.
@@ -70,6 +68,8 @@
 	MSN:
 	* Fix possible crashes caused by not validating incoming messages as
 	  UTF-8. (Thijs Alkemade) (#14884)
+	* Support new protocol version MSNP18. (#14753)
+	* Fix messages to offline contacts. (#14302)
 
 	Windows-Specific Changes:
 	* Fix compilation of the Bonjour protocol plugin. (#14802)
diff -r 3f81e3c3064c -r f9650f6b636d libpurple/protocols/msn/contact.c
diff -r 3f81e3c3064c -r f9650f6b636d libpurple/protocols/msn/msn.c
diff -r 3f81e3c3064c -r f9650f6b636d libpurple/protocols/msn/nexus.c
diff -r 3f81e3c3064c -r f9650f6b636d libpurple/protocols/msn/notification.c
diff -r 3f81e3c3064c -r f9650f6b636d libpurple/protocols/msn/session.c
diff -r 3f81e3c3064c -r f9650f6b636d libpurple/protocols/msn/switchboard.c
diff -r 3f81e3c3064c -r f9650f6b636d libpurple/protocols/msn/user.c