/pidgin/main: 20e1edc44d99: Merge.

[Andrew Victor]

Changeset: 20e1edc44d9947ddf4812762db66763e1b93ae2e
Author:	 Andrew Victor <andrew.victor at mxit.com>
Date:	 2012-12-18 16:06 +0200
Branch:	 mxit-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/20e1edc44d99

Description:

Merge.

diffstat:

 ChangeLog                       |  6 ++++++
 libpurple/protocols/mxit/mxit.c |  1 -
 2 files changed, 6 insertions(+), 1 deletions(-)

diffs (27 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,12 @@ version 2.10.7:
 	* Fix a crash when removing a user before its icon is loaded. (Mark
 	  Barfield) (#15217)
 
+	MXit:
+	* Display farewell messages in a different colour to distinguish
+	  them from normal messages.
+	* Add support for typing notification.
+	* Add support for the Relationship Status profile attribute.
+
 	Yahoo!:
 	* Fix a double-free in profile/picture loading code. (Mihai Serban)
 	  (#15053)
diff --git a/libpurple/protocols/mxit/mxit.c b/libpurple/protocols/mxit/mxit.c
--- a/libpurple/protocols/mxit/mxit.c
+++ b/libpurple/protocols/mxit/mxit.c
@@ -650,7 +650,6 @@ static GList* mxit_blist_menu( PurpleBli
 	return m;
 }
 
-
 /*------------------------------------------------------------------------
  * Return Chat-room default settings.
  *