pidgin: 9d78a21f: merge of 'b11803e108556a29e1204a3ff1fd00...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 9d78a21f49219b234b21c2dd2023c4ad160a2c9c
Parent:   b11803e108556a29e1204a3ff1fd00a0890d7733
Parent:   da7bc1419142f97b2def127ef42c9c7c562e77e3
Author:   andrew.victor at mxit.com
Date:     08/24/11 02:45:30
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9d78a21f49219b234b21c2dd2023c4ad160a2c9c

Changelog: 

merge of 'b11803e108556a29e1204a3ff1fd00a0890d7733'
     and 'da7bc1419142f97b2def127ef42c9c7c562e77e3'

Changes against parent b11803e108556a29e1204a3ff1fd00a0890d7733

  patched  libpurple/protocols/mxit/login.c

Changes against parent da7bc1419142f97b2def127ef42c9c7c562e77e3

  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/sbconn.c
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/filexfer.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/splashscreen.c
  patched  libpurple/protocols/mxit/voicevideo.c
  patched  pidgin/gtkconv.c