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

[thijsalkemade at gmail.com]

----------------------------------------------------------------------
Revision: f5358148539500db1af681b90d18481a7277906c
Parent:   62dc4397d71bdd6ca7a90d0f5393d2bc9ebc8fd8
Parent:   90563b555003eba18fcf35404c001c70b9f4c184
Author:   thijsalkemade at gmail.com
Date:     06/26/11 15:41:22
Branch:   im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/f5358148539500db1af681b90d18481a7277906c

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 90563b555003eba18fcf35404c001c70b9f4c184)
            to branch 'im.pidgin.adium' (head 62dc4397d71bdd6ca7a90d0f5393d2bc9ebc8fd8)

Changes against parent 62dc4397d71bdd6ca7a90d0f5393d2bc9ebc8fd8

  added    libpurple/tests/test_xmlnode.c
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  finch/finch.c
  patched  libpurple/Makefile.am
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/gg/search.c
  patched  libpurple/protocols/gg/search.h
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/tests.h
  patched  libpurple/value.h
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkft.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtksmiley.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/plugins/gevolution/gevolution.c
  patched  po/ChangeLog
  patched  po/de.po

Changes against parent 90563b555003eba18fcf35404c001c70b9f4c184

  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/oscar/peer.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  po/POTFILES.in