Tue, 18 Dec 2012 16:06:51 +0200
Merge.
--- a/ChangeLog Tue Dec 18 15:57:47 2012 +0200 +++ b/ChangeLog Tue Dec 18 16:06:51 2012 +0200 @@ -32,6 +32,12 @@ * 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)
--- a/libpurple/protocols/mxit/mxit.c Tue Dec 18 15:57:47 2012 +0200 +++ b/libpurple/protocols/mxit/mxit.c Tue Dec 18 16:06:51 2012 +0200 @@ -650,7 +650,6 @@ return m; } - /*------------------------------------------------------------------------ * Return Chat-room default settings. *