pidgin.mxit: 10b0e586: merge of '480053700827137374fa90746e7c0d...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 10b0e5864c64f6998b38b83e74af0cbb63e7be1f
Parent:   480053700827137374fa90746e7c0dbf6e4d1cd5
Parent:   f385f7fe1f2b01848baf809102442bed936ebf54
Author:   andrew.victor at mxit.com
Date:     05/15/11 16:07:27
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/10b0e5864c64f6998b38b83e74af0cbb63e7be1f

Changelog: 

merge of '480053700827137374fa90746e7c0dbf6e4d1cd5'
     and 'f385f7fe1f2b01848baf809102442bed936ebf54'

Changes against parent 480053700827137374fa90746e7c0dbf6e4d1cd5

  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/slpmsg_part.h
  patched  libpurple/protocols/mxit/protocol.c
  patched  po/ChangeLog
  patched  po/nl.po
  patched  po/nn.po
  patched  po/ro.po

Changes against parent f385f7fe1f2b01848baf809102442bed936ebf54

no changes