adium: b0d57edc: propagate from branch 'im.pidgin.pidgin'...

[thijsalkemade at gmail.com]

----------------------------------------------------------------------
Revision: b0d57edc051b50743ebd8b9521d261a8f8529f6b
Parent:   0a29598954829714ec2771ce81ea576407372d88
Parent:   3af0a4445a2e76ca0d3d66ad4a3fb376448826ce
Author:   thijsalkemade at gmail.com
Date:     07/30/11 03:18:31
Branch:   im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/b0d57edc051b50743ebd8b9521d261a8f8529f6b

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 3af0a4445a2e76ca0d3d66ad4a3fb376448826ce)
            to branch 'im.pidgin.adium' (head 0a29598954829714ec2771ce81ea576407372d88)

Changes against parent 0a29598954829714ec2771ce81ea576407372d88

  patched  AUTHORS
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  libpurple/conversation.c
  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/gg.c
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/usermood.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/upnp.c
  patched  libpurple/xmlnode.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdialogs.h
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtkprefs.c

Changes against parent 3af0a4445a2e76ca0d3d66ad4a3fb376448826ce

  patched  configure.ac
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/blist.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/parser.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  po/POTFILES.in