pidgin.mxit: afe56ac5: merge of '75c1e83a87528fd242c342004ffcc0...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: afe56ac5850bf1b2de45d4fd4c0e271c76adf752
Parent:   75c1e83a87528fd242c342004ffcc0a4af52164f
Parent:   8945b5678260b7adafc8d3f4b9e3622a756668dd
Author:   andrew.victor at mxit.com
Date:     03/29/11 02:55:54
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/afe56ac5850bf1b2de45d4fd4c0e271c76adf752

Changelog: 

merge of '75c1e83a87528fd242c342004ffcc0a4af52164f'
     and '8945b5678260b7adafc8d3f4b9e3622a756668dd'

Changes against parent 75c1e83a87528fd242c342004ffcc0a4af52164f

  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/profile.h
  patched  libpurple/protocols/mxit/protocol.c

Changes against parent 8945b5678260b7adafc8d3f4b9e3622a756668dd

  added    libpurple/protocols/gg/lib/debug.c
  added    libpurple/protocols/gg/lib/encoding.c
  added    libpurple/protocols/gg/lib/encoding.h
  added    libpurple/protocols/gg/lib/handlers.c
  added    libpurple/protocols/gg/lib/libgadu-debug.h
  added    libpurple/protocols/gg/lib/message.c
  added    libpurple/protocols/gg/lib/message.h
  added    libpurple/protocols/gg/lib/session.h
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/gaim-compat.h
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/gg/Makefile.mingw
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/COPYING
  patched  libpurple/protocols/gg/lib/common.c
  patched  libpurple/protocols/gg/lib/dcc.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/http.c
  patched  libpurple/protocols/gg/lib/libgadu-internal.h
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/obsolete.c
  patched  libpurple/protocols/gg/lib/protocol.h
  patched  libpurple/protocols/gg/lib/pubdir50.c
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/gg/lib/resolver.h
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/oscar/encoding.c
  patched  libpurple/protocols/oscar/userinfo.c
  patched  libpurple/protocols/simple/simple.h
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/plugins/vvconfig.c