pidgin: b96fb413: Make the changes from Andrew Victor's 31...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: b96fb413eb4d1392e8ae73177b72639f74da632c
Parent:   15918ce5d9936f807bc9de90658ac830d3b343f9
Author:   markdoliner at pidgin.im
Date:     08/01/10 03:04:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b96fb413eb4d1392e8ae73177b72639f74da632c

Changelog: 

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.

Changes against parent 15918ce5d9936f807bc9de90658ac830d3b343f9

  patched  ChangeLog

-------------- next part --------------
============================================================
--- ChangeLog	33fb7bf057c9489ad9373fc85febcc6d558c1171
+++ ChangeLog	96bc1807ec81b7bd697e25f43d5b43aea3342a33
@@ -38,7 +38,9 @@ version 2.7.3 (??/??/????):
 	* 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