pidgin.mxit: 1b5e4524: propagate from branch 'im.pidgin.pidgin'...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 1b5e45245d72950657e22f873b57696ec2191f8c
Parent:   4155786dc74833813772e14bdffe59b2464cda13
Parent:   9adf3d387affef84b59224cf0c9a6e10ed958159
Author:   andrew.victor at mxit.com
Date:     08/13/11 18:11:50
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/1b5e45245d72950657e22f873b57696ec2191f8c

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 4155786dc74833813772e14bdffe59b2464cda13)
            to branch 'im.pidgin.pidgin.mxit' (head 9adf3d387affef84b59224cf0c9a6e10ed958159)

Changes against parent 4155786dc74833813772e14bdffe59b2464cda13

  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/mxit/cipher.h
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/markup.h
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/profile.h
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/mxit/voicevideo.c

Changes against parent 9adf3d387affef84b59224cf0c9a6e10ed958159

  patched  pidgin/pixmaps/Makefile.am