pidgin.mxit: 128e0ea0: merge of '68f430dcc865c17bad99e7e29c516f...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 128e0ea032986b3c74c6a3a1abf0e812747960cd
Parent:   68f430dcc865c17bad99e7e29c516f5db7cb4336
Parent:   f6e1d9574fc2a18944c8b9977aa15586a06728e8
Author:   andrew.victor at mxit.com
Date:     05/05/11 11:41:38
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/128e0ea032986b3c74c6a3a1abf0e812747960cd

Changelog: 

merge of '68f430dcc865c17bad99e7e29c516f5db7cb4336'
     and 'f6e1d9574fc2a18944c8b9977aa15586a06728e8'

Changes against parent 68f430dcc865c17bad99e7e29c516f5db7cb4336

  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/roster.c

Changes against parent f6e1d9574fc2a18944c8b9977aa15586a06728e8

  patched  COPYRIGHT
  patched  ChangeLog
  patched  finch/gntnotify.c
  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h
  patched  libpurple/util.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  po/de.po