pidgin: f8612813: merge of '385542a8270ac30d2121b533494264...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: f86128133fa0ce7f4a659fe8c08e182c0ae82695
Parent:   385542a8270ac30d2121b533494264a28cd04423
Parent:   99c20d86165b24daadeb247977bbb6d4b80b94bf
Author:   markdoliner at pidgin.im
Date:     03/07/11 01:43:26
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f86128133fa0ce7f4a659fe8c08e182c0ae82695

Changelog: 

merge of '385542a8270ac30d2121b533494264a28cd04423'
     and '99c20d86165b24daadeb247977bbb6d4b80b94bf'

Changes against parent 385542a8270ac30d2121b533494264a28cd04423

  added    libpurple/protocols/mxit/voicevideo.c
  added    libpurple/protocols/mxit/voicevideo.h
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  libpurple/ft.c
  patched  libpurple/protocols/jabber/chat.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jutil.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/mxit/Makefile.am
  patched  libpurple/protocols/mxit/Makefile.mingw
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/chunk.c
  patched  libpurple/protocols/mxit/chunk.h
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  patched  pidgin/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdocklet-gtk.c
  patched  pidgin/gtkmain.c
  patched  po/de.po

Changes against parent 99c20d86165b24daadeb247977bbb6d4b80b94bf

  patched  libpurple/protocols/jabber/jabber.c