Sun, 01 Aug 2010 13:43:37 +0000
merge of '71a73aa7f10ccfb5cbae670475407eac52a42bed'
and 'fdd50d8649e357ccc96eca4186f35de20aa69c84'
--- a/ChangeLog Sun Aug 01 06:55:21 2010 +0000 +++ b/ChangeLog Sun Aug 01 13:43:37 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