pidgin: 9a087308: merge of '377fab6845c6367df5a06eac7afdc9...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 9a08730847bfae5de18b19b1836579fe5fe03b04
Parent:   377fab6845c6367df5a06eac7afdc93bb2c62e73
Parent:   8604939c29e01882cf36e5aeac696d6ebd76c48f
Author:   andrew.victor at mxit.com
Date:     11/09/11 02:18:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9a08730847bfae5de18b19b1836579fe5fe03b04

Changelog: 

merge of '377fab6845c6367df5a06eac7afdc93bb2c62e73'
     and '8604939c29e01882cf36e5aeac696d6ebd76c48f'

Changes against parent 377fab6845c6367df5a06eac7afdc93bb2c62e73

  patched  ChangeLog.API
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/plugins/ssl/Makefile.am
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/common.c
  patched  libpurple/protocols/irc/cmds.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/oscar/flap_connection.c

Changes against parent 8604939c29e01882cf36e5aeac696d6ebd76c48f

  patched  libpurple/protocols/mxit/filexfer.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h