pidgin.mxit: 9454b5c8: propagate from branch 'im.pidgin.pidgin'...

[pieter.loubser at mxit.com]

----------------------------------------------------------------------
Revision: 9454b5c85cbce0a3d179643761b484dae8ac7ad9
Parent:   2483ea1a3b7543d52ab895b02d98a83adf2964ea
Parent:   ca07365c6eb9a12b008397dd5ad34231e8d6e89e
Author:   pieter.loubser at mxit.com
Date:     08/16/11 02:02:59
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/9454b5c85cbce0a3d179643761b484dae8ac7ad9

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head ca07365c6eb9a12b008397dd5ad34231e8d6e89e)
            to branch 'im.pidgin.pidgin.mxit' (head 2483ea1a3b7543d52ab895b02d98a83adf2964ea)

Changes against parent 2483ea1a3b7543d52ab895b02d98a83adf2964ea

  patched  ChangeLog
  patched  libpurple/nat-pmp.c
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/cmdproc.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/switchboard.h
  patched  po/ca.po
  patched  po/ca at valencia.po

Changes against parent ca07365c6eb9a12b008397dd5ad34231e8d6e89e

  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