pidgin: 7de2e5e7: merge of 'b37e581d0bfe6efa24595ece99a284...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 7de2e5e79661bbc819c79d350efb54478f64317f
Parent:   b37e581d0bfe6efa24595ece99a284dd51c08d78
Parent:   ddda3b9ca9b6cf8b06736f8b59b92683511117df
Author:   qulogic at pidgin.im
Date:     01/08/11 23:54:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7de2e5e79661bbc819c79d350efb54478f64317f

Changelog: 

merge of 'b37e581d0bfe6efa24595ece99a284dd51c08d78'
     and 'ddda3b9ca9b6cf8b06736f8b59b92683511117df'

Changes against parent b37e581d0bfe6efa24595ece99a284dd51c08d78

  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/xfer.c
  patched  libpurple/protocols/msn/xfer.h

Changes against parent ddda3b9ca9b6cf8b06736f8b59b92683511117df

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/dbus-analyze-signals.py
  patched  libpurple/dbus-server.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/mediamanager.c
  patched  libpurple/plugins/perl/common/Makefile.PL.in
  patched  libpurple/protocols/jabber/jingle/content.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/plugins/perl/common/Makefile.PL.in