pidgin: b4fc734e: merge of '4550b9538730036d9023f75e224ffb...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: b4fc734e44f103a918a1a34ad16d57bf4a40ef16
Parent:   4550b9538730036d9023f75e224ffb15f50f020f
Parent:   75ec74edcc85a4e376ccf3c424deb66d64db6ba9
Author:   andrew.victor at mxit.com
Date:     09/02/11 14:57:04
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b4fc734e44f103a918a1a34ad16d57bf4a40ef16

Changelog: 

merge of '4550b9538730036d9023f75e224ffb15f50f020f'
     and '75ec74edcc85a4e376ccf3c424deb66d64db6ba9'

Changes against parent 4550b9538730036d9023f75e224ffb15f50f020f

  dropped  pidgin/gtkdocklet-gtk.c
  patched  ChangeLog.API
  patched  libpurple/buddyicon.c
  patched  libpurple/buddyicon.h
  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/imgstore.h
  patched  libpurple/network.c
  patched  libpurple/plugins/perl/common/Status.xs
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/jingleinfo.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h
  patched  libpurple/prpl.c
  patched  libpurple/prpl.h
  patched  libpurple/server.c
  patched  libpurple/server.h
  patched  libpurple/status.c
  patched  libpurple/status.h
  patched  libpurple/stun.c
  patched  pidgin/Makefile.am
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtkdocklet.h

Changes against parent 75ec74edcc85a4e376ccf3c424deb66d64db6ba9

  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/myspace/user.c