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

[thijsalkemade at gmail.com]

----------------------------------------------------------------------
Revision: b5a51884d41f2b5ffd21b1443cc57f126a97273b
Parent:   78f01024866db9d9208f8cc09b8321c7ed04c140
Parent:   9d0c0294c3519913a66f8e5800ef2e1752cadd42
Author:   thijsalkemade at gmail.com
Date:     05/08/12 08:54:49
Branch:   im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/b5a51884d41f2b5ffd21b1443cc57f126a97273b

Changelog: 

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 9d0c0294c3519913a66f8e5800ef2e1752cadd42)
            to branch 'im.pidgin.adium' (head 78f01024866db9d9208f8cc09b8321c7ed04c140)

Changes against parent 78f01024866db9d9208f8cc09b8321c7ed04c140

  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  Makefile.am
  patched  Makefile.mingw
  patched  configure.ac
  patched  finch/libgnt/gntwm.c
  patched  libpurple/Makefile.am
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/media.c
  patched  libpurple/mediamanager.c
  patched  libpurple/network.c
  patched  libpurple/plugins/autoaccept.c
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/jingle/content.c
  patched  libpurple/protocols/jabber/jingle/iceudp.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/rawudp.c
  patched  libpurple/protocols/jabber/jingle/rtp.c
  patched  libpurple/protocols/jabber/jingle/session.c
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  libpurple/protocols/jabber/win32/posix.uname.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/httpconn.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/oscar/family_icq.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/proxy.c
  patched  libpurple/win32/global.mak
  patched  libpurple/win32/libc_interface.c
  patched  libpurple/win32/libc_interface.h
  patched  libpurple/win32/libc_internal.h
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/disco/gtkdisco.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  po/ChangeLog
  patched  po/af.po
  patched  po/am.po
  patched  po/ar.po
  patched  po/as.po
  patched  po/az.po
  patched  po/be at latin.po
  patched  po/bg.po
  patched  po/bn.po
  patched  po/bn_IN.po
  patched  po/bs.po
  patched  po/ca.po
  patched  po/ca at valencia.po
  patched  po/cs.po
  patched  po/da.po
  patched  po/de.po
  patched  po/dz.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_CA.po
  patched  po/en_GB.po
  patched  po/eo.po
  patched  po/es.po
  patched  po/et.po
  patched  po/eu.po
  patched  po/fa.po
  patched  po/fi.po
  patched  po/fr.po
  patched  po/ga.po
  patched  po/gl.po
  patched  po/gu.po
  patched  po/he.po
  patched  po/hi.po
  patched  po/hr.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/id.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/ka.po
  patched  po/km.po
  patched  po/kn.po
  patched  po/ko.po
  patched  po/ku.po
  patched  po/lo.po
  patched  po/lt.po
  patched  po/mai.po
  patched  po/mhr.po
  patched  po/mk.po
  patched  po/ml.po
  patched  po/mn.po
  patched  po/mr.po
  patched  po/ms_MY.po
  patched  po/my_MM.po
  patched  po/nb.po
  patched  po/ne.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/oc.po
  patched  po/or.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ps.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/ro.po
  patched  po/ru.po
  patched  po/si.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/sq.po
  patched  po/sr.po
  patched  po/sr at latin.po
  patched  po/sv.po
  patched  po/sw.po
  patched  po/ta.po
  patched  po/te.po
  patched  po/th.po
  patched  po/tr.po
  patched  po/uk.po
  patched  po/ur.po
  patched  po/vi.po
  patched  po/xh.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po

Changes against parent 9d0c0294c3519913a66f8e5800ef2e1752cadd42

  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/message.c
  patched  libpurple/protocols/jabber/parser.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/tests/test_xmlnode.c
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h
  patched  po/POTFILES.in