pidgin: be737316: merge of '2825cfec5e2f9ce0b43361fdd7bdd2...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: be7373160916cdcb9710432f506e4eac29df8296
Parent:   2825cfec5e2f9ce0b43361fdd7bdd21c4ea69b24
Parent:   4a5d49d94ae44a21c23f7977dd7b6b9f69dfb000
Author:   andrew.victor at mxit.com
Date:     09/05/11 14:34:32
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/be7373160916cdcb9710432f506e4eac29df8296

Changelog: 

merge of '2825cfec5e2f9ce0b43361fdd7bdd21c4ea69b24'
     and '4a5d49d94ae44a21c23f7977dd7b6b9f69dfb000'

Changes against parent 2825cfec5e2f9ce0b43361fdd7bdd21c4ea69b24

  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  finch/gntblist.c
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/blist.c
  patched  libpurple/plugins/perl/common/Account.xs
  patched  libpurple/protocols/Makefile.am
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/jabber/libxmpp.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/jabber/roster.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/null/nullprpl.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/buddy.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/silc/silcpurple.h
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libyahoo.c
  patched  libpurple/protocols/yahoo/libyahoojp.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/prpl.h
  patched  libpurple/tests/test_xmlnode.c
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdocklet.c

Changes against parent 4a5d49d94ae44a21c23f7977dd7b6b9f69dfb000

  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/myspace/user.c