pidgin.mxit: 2483ea1a: merge of 'abe467cd836e25b339d81461c056f6...

[pieter.loubser at mxit.com]

----------------------------------------------------------------------
Revision: 2483ea1a3b7543d52ab895b02d98a83adf2964ea
Parent:   abe467cd836e25b339d81461c056f6289d88b2f0
Parent:   c13c35c07888cc787731bd388eb99734c41f67ef
Author:   pieter.loubser at mxit.com
Date:     08/16/11 01:38:01
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/2483ea1a3b7543d52ab895b02d98a83adf2964ea

Changelog: 

merge of 'abe467cd836e25b339d81461c056f6289d88b2f0'
     and 'c13c35c07888cc787731bd388eb99734c41f67ef'

Changes against parent abe467cd836e25b339d81461c056f6289d88b2f0

  patched  ChangeLog
  patched  libpurple/dnssrv.c
  patched  libpurple/log.c
  patched  libpurple/plugins/filectl.c
  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
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/stun.c
  patched  pidgin/pixmaps/Makefile.am
  patched  po/ca.po

Changes against parent c13c35c07888cc787731bd388eb99734c41f67ef

  patched  libpurple/protocols/mxit/cipher.c