pidgin: 4e865b10: merge of '246ce23ba85b41bf89269edfa8ec16...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 4e865b10122889b3e50c3d15bb512428239cb1d2
Parent:   246ce23ba85b41bf89269edfa8ec16583ad89fb3
Parent:   7b2b39f29c663a3b1ad776bae1361dcfe6c4db16
Author:   andrew.victor at mxit.com
Date:     09/24/11 18:21:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4e865b10122889b3e50c3d15bb512428239cb1d2

Changelog: 

merge of '246ce23ba85b41bf89269edfa8ec16583ad89fb3'
     and '7b2b39f29c663a3b1ad776bae1361dcfe6c4db16'

Changes against parent 246ce23ba85b41bf89269edfa8ec16583ad89fb3

  patched  ChangeLog.API
  patched  finch/plugins/gnttinyurl.c
  patched  libpurple/network.c
  patched  libpurple/network.h
  patched  libpurple/plugins/perl/common/Network.xs
  patched  libpurple/plugins/perl/common/Util.xs
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/dcc_send.c
  patched  libpurple/protocols/jabber/google/relay.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/presence.h
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/jabber/useravatar.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_aliases.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/protocols/yahoo/yahoo_picture.c
  patched  libpurple/protocols/yahoo/yahoo_profile.c
  patched  libpurple/stun.c
  patched  libpurple/upnp.c
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtksmiley.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/plugins/relnot.c

Changes against parent 7b2b39f29c663a3b1ad776bae1361dcfe6c4db16

  patched  pidgin/gtkconv-theme.c