pidgin: bfc65d29: merge of '1b285d0b375fbd5e778db6bb852a7b...

[kstange at pidgin.im]

----------------------------------------------------------------------
Revision: bfc65d29c419fdc7f739266b96e1fbb001ef07c6
Parent:   1b285d0b375fbd5e778db6bb852a7b089feb16a3
Parent:   d1328041ee003fdee29a0cf6ae44b44727a49bb8
Author:   kstange at pidgin.im
Date:     10/01/11 20:06:40
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bfc65d29c419fdc7f739266b96e1fbb001ef07c6

Changelog: 

merge of '1b285d0b375fbd5e778db6bb852a7b089feb16a3'
     and 'd1328041ee003fdee29a0cf6ae44b44727a49bb8'

Changes against parent 1b285d0b375fbd5e778db6bb852a7b089feb16a3

  patched  finch/gntconv.c
  patched  libpurple/conversation.h

Changes against parent d1328041ee003fdee29a0cf6ae44b44727a49bb8

  patched  ChangeLog.API
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/accountopt.c
  patched  libpurple/accountopt.h
  patched  libpurple/blist.c
  patched  libpurple/connection.c
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/dbus-useful.c
  patched  libpurple/example/nullclient.c
  patched  libpurple/log.c
  patched  libpurple/plugins/statenotify.c
  patched  libpurple/pounce.c
  patched  libpurple/privacy.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/msn/httpconn.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/servconn.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/null/nullprpl.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoochat.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/savedstatuses.c
  patched  libpurple/status.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkprivacy.c
  patched  pidgin/gtksound.c
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/adiumthemes/webkit.c
  patched  pidgin/plugins/musicmessaging/musicmessaging.c
  patched  pidgin/plugins/xmppconsole.c