pidgin: a4fbdf1f: merge of '269c6e29c67a1c066871499e76575d...

[elb at pidgin.im]

----------------------------------------------------------------------
Revision: a4fbdf1fa55332120d357ab649000d518830f0fe
Parent:   269c6e29c67a1c066871499e76575d4700bf6744
Parent:   f456e895f18adad6c0e3178c99a73f6fbd439487
Author:   elb at pidgin.im
Date:     08/11/11 10:44:44
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a4fbdf1fa55332120d357ab649000d518830f0fe

Changelog: 

merge of '269c6e29c67a1c066871499e76575d4700bf6744'
     and 'f456e895f18adad6c0e3178c99a73f6fbd439487'

Changes against parent 269c6e29c67a1c066871499e76575d4700bf6744

  patched  ChangeLog
  patched  ChangeLog.API
  patched  libpurple/dnsquery.c
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/plugins/log_reader.c
  patched  libpurple/prefs.c
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkmedia.c
  patched  po/de.po

Changes against parent f456e895f18adad6c0e3178c99a73f6fbd439487

  patched  ChangeLog
  patched  libpurple/plugins/tcl/tcl_ref.c
  patched  libpurple/plugins/tcl/tcl_signals.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/win32/posix.uname.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/zephyr/ZAsyncLocate.c
  patched  libpurple/protocols/zephyr/ZInit.c
  patched  libpurple/protocols/zephyr/ZRetSubs.c
  patched  libpurple/protocols/zephyr/Zinternal.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/proxy.c
  patched  libpurple/win32/libc_interface.c