pidgin.mxit: 56ae109a: merge of '24c90383cc6b4a1eb90ffea0adaf8b...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 56ae109a077095bf60ec2e6ae82f5d2cebd64ab8
Parent:   24c90383cc6b4a1eb90ffea0adaf8bb2f5af2748
Parent:   2c5693c2e1bea255e21e7ed3cde5fa79e3e79567
Author:   datallah at pidgin.im
Date:     06/04/12 10:18:54
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/56ae109a077095bf60ec2e6ae82f5d2cebd64ab8

Changelog: 

merge of '24c90383cc6b4a1eb90ffea0adaf8bb2f5af2748'
     and '2c5693c2e1bea255e21e7ed3cde5fa79e3e79567'

Changes against parent 24c90383cc6b4a1eb90ffea0adaf8bb2f5af2748

no changes

Changes against parent 2c5693c2e1bea255e21e7ed3cde5fa79e3e79567

  added    finch/gntmenuutil.c
  added    finch/gntmenuutil.h
  patched  ChangeLog
  patched  ChangeLog.API
  patched  finch/Makefile.am
  patched  finch/gntblist.c
  patched  finch/gntconv.c
  patched  finch/gntconv.h
  patched  libpurple/blist.c
  patched  libpurple/blist.h
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/util.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/plugins/disco/gtkdisco.c