pidgin.mxit: 1752eca8: merge of '618bd6eb0a0f4843c8ed0e92f325a3...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 1752eca840ee38709777126fdc81af5af7763e54
Parent:   618bd6eb0a0f4843c8ed0e92f325a36209f468aa
Parent:   6c013884b5884934bee1199eb43165ef688974da
Author:   andrew.victor at mxit.com
Date:     06/21/11 01:07:03
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/1752eca840ee38709777126fdc81af5af7763e54

Changelog: 

merge of '618bd6eb0a0f4843c8ed0e92f325a36209f468aa'
     and '6c013884b5884934bee1199eb43165ef688974da'

Changes against parent 618bd6eb0a0f4843c8ed0e92f325a36209f468aa

  patched  ChangeLog
  patched  configure.ac
  patched  finch/finch.c
  patched  libpurple/Makefile.am
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/gg/search.c
  patched  libpurple/protocols/gg/search.h
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkmain.c
  patched  pidgin/plugins/gevolution/gevolution.c

Changes against parent 6c013884b5884934bee1199eb43165ef688974da

  patched  ChangeLog