pidgin: 53a1e640: merge of '01dbf4adfbd244ad73e7c0a6850a5b...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 53a1e640d1450261d9ad2c46d8205c9e79443336
Parent:   01dbf4adfbd244ad73e7c0a6850a5bcc9d0b9582
Parent:   7d17d6b03c98b91ec1f90c5f17f7c923973f2e2c
Author:   markdoliner at pidgin.im
Date:     08/21/11 17:27:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/53a1e640d1450261d9ad2c46d8205c9e79443336

Changelog: 

merge of '01dbf4adfbd244ad73e7c0a6850a5bcc9d0b9582'
     and '7d17d6b03c98b91ec1f90c5f17f7c923973f2e2c'

Changes against parent 01dbf4adfbd244ad73e7c0a6850a5bcc9d0b9582

  patched  ChangeLog
  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/mxit.h
  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.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/mxit/voicevideo.c

Changes against parent 7d17d6b03c98b91ec1f90c5f17f7c923973f2e2c

  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_profile.c
  patched  libpurple/util.h