pidgin: 556a04f5: merge of '2873917d9d4d30d86018ef5da25d80...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 556a04f5e3dc6f8e218513dd260fd60bb13c33c7
Parent:   2873917d9d4d30d86018ef5da25d8076c9c402ab
Parent:   c0b910c136c2999321b3ee2969b3e2c60abd11b8
Author:   markdoliner at pidgin.im
Date:     03/07/11 21:27:47
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/556a04f5e3dc6f8e218513dd260fd60bb13c33c7

Changelog: 

merge of '2873917d9d4d30d86018ef5da25d8076c9c402ab'
     and 'c0b910c136c2999321b3ee2969b3e2c60abd11b8'

Changes against parent 2873917d9d4d30d86018ef5da25d8076c9c402ab

  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 c0b910c136c2999321b3ee2969b3e2c60abd11b8

  patched  libpurple/protocols/jabber/jabber.c