cpw.malu.xmpp.google_ft: 59c206f1: merge of '82c3cd71efd7159c6e656d0410c4b6...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 59c206f14b44ad120c7c131626dad3e069b2c25e
Parent:   82c3cd71efd7159c6e656d0410c4b6f59513c61d
Parent:   a07bfe777addd082c9414ee6f9807180991539c2
Author:   malu at pidgin.im
Date:     09/20/10 16:09:45
Branch:   im.pidgin.cpw.malu.xmpp.google_ft
URL: http://d.pidgin.im/viewmtn/revision/info/59c206f14b44ad120c7c131626dad3e069b2c25e

Changelog: 

merge of '82c3cd71efd7159c6e656d0410c4b6f59513c61d'
     and 'a07bfe777addd082c9414ee6f9807180991539c2'

Changes against parent 82c3cd71efd7159c6e656d0410c4b6f59513c61d

  patched  libpurple/protocols/jabber/google/google_av.c
  patched  libpurple/protocols/jabber/google/google_share.c

Changes against parent a07bfe777addd082c9414ee6f9807180991539c2

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/dnssrv.c
  patched  libpurple/network.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_plain.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  libpurple/purple-remote
  patched  libpurple/util.c
  patched  libpurple/win32/libc_interface.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdebug.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/win32/gtkwin32dep.c
  patched  pidgin/win32/wspell.c
  patched  po/de.po