pidgin.mxit: b013affa: merge of '0990b7d91cba25c97d386f33c79e39...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: b013affa69881b165f9aa66f81f72e81a6163906
Parent:   0990b7d91cba25c97d386f33c79e396b48f3be40
Parent:   83311eb45a13ca3544ffcb63dbc13bdec2d43677
Author:   andrew.victor at mxit.com
Date:     08/16/11 02:24:59
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/b013affa69881b165f9aa66f81f72e81a6163906

Changelog: 

merge of '0990b7d91cba25c97d386f33c79e396b48f3be40'
     and '83311eb45a13ca3544ffcb63dbc13bdec2d43677'

Changes against parent 0990b7d91cba25c97d386f33c79e396b48f3be40

  patched  ChangeLog
  patched  libpurple/nat-pmp.c
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/cmdproc.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/switchboard.h
  patched  po/ca.po
  patched  po/ca at valencia.po

Changes against parent 83311eb45a13ca3544ffcb63dbc13bdec2d43677

  patched  ChangeLog