# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1280646288 0
# Node ID bb1d593f185c2c4a78f3dc1814ac33d4d2c6cc1c
# Parent  2244a84407a499ee54af23aa8b66348aba6b84bc
Make the changes from Andrew Victor's 3113fa54190de8c27a27e7001e9d902dca70037c
in im.pidgin.pidgin.  The last line of that commit shouldn't be included here,
so I'm making these changes by hand.  When we merge that branch to here or
vice versa it MIGHT conflict.  But it should be pretty easy to figure out how
to fix it.

diff -r 2244a84407a4 -r bb1d593f185c ChangeLog
--- a/ChangeLog	Sun Aug 01 03:23:24 2010 +0000
+++ b/ChangeLog	Sun Aug 01 07:04:48 2010 +0000
@@ -38,7 +38,9 @@
 	* If a buddy is offline and we see from their profile that they have
 	  updated their avatar, request the new avatar image from the server.
 	* Fix a possible crash if a link is clicked while disconnected.
-	* New MXit Moods and Emoticons.
+	* Unescape any escaped characters in a chatroom nickname.
+	* Add the new MXit moods and emoticons.
+	* MXit emoticons added to the small emoticon theme.
 
 	XMPP:
 	* Allow connecting to servers that only advertise GSSAPI and expect