# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1280670217 0
# Node ID 6f9132dcc21eec762197d6df846b9c01df5c1a8a
# Parent  4a88d29b8bae069c01478b1a8d58899eef971076# Parent  bb1d593f185c2c4a78f3dc1814ac33d4d2c6cc1c
merge of '4af706c0918fd1eb930a0f2807a80a9f189b7b98'
     and 'b96fb413eb4d1392e8ae73177b72639f74da632c'

diff -r 4a88d29b8bae -r 6f9132dcc21e ChangeLog
--- 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