# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1300038004 0
# Node ID 0362da30c62a48c01120676adfd79f849a697032
# Parent  ae391615dc52f2508c4ffaa285b08fc938255916# Parent  8a675683fcea30ef1bbf08c6bacdd2ca0fd4a792
propagate from branch 'im.pidgin.pidgin.mxit' (head d2621e74f4d5c342cc30a7e49c8a05121f05050a)
            to branch 'im.pidgin.pidgin' (head 87366dcb07a9cec63d96165e863ec07ccbc83324)

diff -r ae391615dc52 -r 0362da30c62a ChangeLog
--- a/ChangeLog	Sun Mar 13 17:36:27 2011 +0000
+++ b/ChangeLog	Sun Mar 13 17:40:04 2011 +0000
@@ -33,6 +33,15 @@
 	* Fix bug that prevented added buddies to your buddy list in certain
 	  circumstances.  (#13298)
 
+	MXit:
+	* MXit plugin and reported client version now follow the libpurple
+	  version.
+	* Don't try to request profile information for non-user contacts.
+	* Allow Re-Invite for contacts in Deleted or Rejected state.
+	* Ensure we don't send packets too fast to the MXit server and trigger
+	  its flood-detection mechanism.  Also increased the internal packet queue
+	  to 32 packets.
+
 	XMPP:
 	* Fix building on platforms with an older glib (inadvertantly broken in
 	  2.7.10).  (#13329)