pidgin: e826c5bb: merge of '2fa8397877be345efa9c19c1530ad7...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: e826c5bbc7521b4c8991f501178f6e401950d6ff
Parent:   2fa8397877be345efa9c19c1530ad7686236d8e4
Parent:   c6b054bb793c9916eb187da12bda64c518f506df
Author:   darkrain42 at pidgin.im
Date:     10/10/10 01:25:42
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e826c5bbc7521b4c8991f501178f6e401950d6ff

Changelog: 

merge of '2fa8397877be345efa9c19c1530ad7686236d8e4'
     and 'c6b054bb793c9916eb187da12bda64c518f506df'

Changes against parent 2fa8397877be345efa9c19c1530ad7686236d8e4

  patched  libpurple/protocols/jabber/parser.c

Changes against parent c6b054bb793c9916eb187da12bda64c518f506df

  patched  ChangeLog
  patched  libpurple/ft.c
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/bonjour.h
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/dns_sd_proxy.c
  patched  libpurple/protocols/bonjour/dns_sd_proxy.h
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/bonjour/mdns_common.c
  patched  libpurple/protocols/bonjour/mdns_common.h
  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/oscar/oft.c
  patched  libpurple/protocols/qq/file_trans.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  po/de.po