pidgin: 7b998c02: merge of '392709af0c706d582bbd6a2b1f0d94...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 7b998c02b684a694f1089bee715e4a3952bbcf08
Parent:   392709af0c706d582bbd6a2b1f0d9423457e6351
Parent:   b1c7aabc888f764a6ed12bd30699c654534ea253
Author:   malu at pidgin.im
Date:     09/06/10 15:41:27
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7b998c02b684a694f1089bee715e4a3952bbcf08

Changelog: 

merge of '392709af0c706d582bbd6a2b1f0d9423457e6351'
     and 'b1c7aabc888f764a6ed12bd30699c654534ea253'

Changes against parent 392709af0c706d582bbd6a2b1f0d9423457e6351

  added    libpurple/protocols/jabber/google/relay.c
  added    libpurple/protocols/jabber/google/relay.h
  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.mingw
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/jabber/google/google_session.h
  patched  libpurple/protocols/jabber/google/jingleinfo.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/jingle.h
  patched  libpurple/protocols/jabber/jingle/rtp.c

Changes against parent b1c7aabc888f764a6ed12bd30699c654534ea253

  patched  ChangeLog.API
  patched  libpurple/plugins/perl/common/BuddyList.xs
  patched  libpurple/plugins/perl/common/Server.xs
  patched  pidgin/gtkplugin.c
  patched  po/de.po