pidgin: 5097b9aa: merge of '1577331230de94bf1d081cb81f03ae...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 5097b9aa21910f088f8a683e7fa7fcf6a95a458e
Parent:   1577331230de94bf1d081cb81f03ae1271cf8960
Parent:   85490424ef0ad56f257b7f2cc39e24e51d2fe160
Author:   qulogic at pidgin.im
Date:     03/14/11 00:34:34
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5097b9aa21910f088f8a683e7fa7fcf6a95a458e

Changelog: 

merge of '1577331230de94bf1d081cb81f03ae1271cf8960'
     and '85490424ef0ad56f257b7f2cc39e24e51d2fe160'

Changes against parent 1577331230de94bf1d081cb81f03ae1271cf8960

  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  doc/account-signals.dox
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/media-gst.h
  patched  libpurple/media.c
  patched  libpurple/media.h
  patched  libpurple/mediamanager.c
  patched  libpurple/notify.c
  patched  libpurple/notify.h
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/buddy.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_profile.c
  patched  libpurple/signals.c
  patched  libpurple/signals.h
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkft.c
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtklog.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkplugin.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkprivacy.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtkroomlist.c
  patched  pidgin/gtksavedstatuses.c
  patched  pidgin/gtksmiley.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/plugins/disco/gtkdisco.c
  patched  pidgin/plugins/gevolution/add_buddy_dialog.c
  patched  pidgin/plugins/gevolution/assoc-buddy.c
  patched  pidgin/plugins/gevolution/gevolution.c
  patched  pidgin/plugins/spellchk.c
  patched  pidgin/plugins/xmppconsole.c

Changes against parent 85490424ef0ad56f257b7f2cc39e24e51d2fe160

  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/switchboard.c