pidgin: 138447ff: merge of '8e3c82b6770042fa4b42cfd0dee9cb...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 138447ff2ff08dc4e651243969483a74259dd5a7
Parent:   8e3c82b6770042fa4b42cfd0dee9cbcd54ed894a
Parent:   e9fceac2dee9c0b9c449263d63857762c7fe7715
Author:   markdoliner at pidgin.im
Date:     10/30/11 22:29:25
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/138447ff2ff08dc4e651243969483a74259dd5a7

Changelog: 

merge of '8e3c82b6770042fa4b42cfd0dee9cbcd54ed894a'
     and 'e9fceac2dee9c0b9c449263d63857762c7fe7715'

Changes against parent 8e3c82b6770042fa4b42cfd0dee9cbcd54ed894a

  patched  pidgin/gtkmedia.c

Changes against parent e9fceac2dee9c0b9c449263d63857762c7fe7715

  patched  ChangeLog
  patched  ChangeLog.API
  patched  finch/gntconv.c
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/plugins/autoaccept.c
  patched  libpurple/plugins/perl/common/Conversation.xs
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/irc/dcc_send.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/oob.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/oscar/oft.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/ft.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/whiteboard.c
  patched  libpurple/whiteboard.h
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconvwin.h
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtkimhtmltoolbar.h
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/musicmessaging/musicmessaging.c