pidgin: 8604939c: merge of '071d7e809e0a4532e6dc367a6f05ea...

Mon Nov 7 02:37:59 EST 2011

----------------------------------------------------------------------
Revision: 8604939c29e01882cf36e5aeac696d6ebd76c48f
Parent:   071d7e809e0a4532e6dc367a6f05ea43e1ab0de0
Parent:   f7828c5032d27f14c4543fe56ed1b5cecb5517f7
Author:   qulogic at pidgin.im
Date:     11/06/11 21:07:59
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8604939c29e01882cf36e5aeac696d6ebd76c48f

Changelog: 

merge of '071d7e809e0a4532e6dc367a6f05ea43e1ab0de0'
     and 'f7828c5032d27f14c4543fe56ed1b5cecb5517f7'

Changes against parent 071d7e809e0a4532e6dc367a6f05ea43e1ab0de0

  patched  libpurple/plugins/ssl/Makefile.am

Changes against parent f7828c5032d27f14c4543fe56ed1b5cecb5517f7

  patched  ChangeLog.API
  patched  libpurple/account.c
  patched  libpurple/account.h
  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