pidgin.mxit: 2dac05a5: merge of 'a1d8c4a9d0690c456343f8fd7b1782...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 2dac05a5983488206ebe3601153bfca71f925d21
Parent:   a1d8c4a9d0690c456343f8fd7b178201a9ab5fad
Parent:   e287e51f3f6469ce3d64fdb6c7900c07464300ef
Author:   andrew.victor at mxit.com
Date:     08/15/11 03:38:21
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/2dac05a5983488206ebe3601153bfca71f925d21

Changelog: 

merge of 'a1d8c4a9d0690c456343f8fd7b178201a9ab5fad'
     and 'e287e51f3f6469ce3d64fdb6c7900c07464300ef'

Changes against parent a1d8c4a9d0690c456343f8fd7b178201a9ab5fad

  patched  ChangeLog

Changes against parent e287e51f3f6469ce3d64fdb6c7900c07464300ef

  patched  ChangeLog
  patched  libpurple/dnssrv.c
  patched  libpurple/log.c
  patched  libpurple/plugins/filectl.c
  patched  libpurple/plugins/tcl/tcl_ref.c
  patched  libpurple/plugins/tcl/tcl_signals.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/win32/posix.uname.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/session.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/sametime/sametime.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/protocols/zephyr/ZAsyncLocate.c
  patched  libpurple/protocols/zephyr/ZInit.c
  patched  libpurple/protocols/zephyr/ZRetSubs.c
  patched  libpurple/protocols/zephyr/Zinternal.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/proxy.c
  patched  libpurple/stun.c
  patched  libpurple/win32/libc_interface.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/pixmaps/Makefile.am
  patched  po/ca.po
  patched  po/de.po