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

[thijsalkemade at gmail.com]

----------------------------------------------------------------------
Revision: f69b22b713390e0c56594cd15494c119222f7ca2
Parent:   29484df15413fe3bbd21bbfcef26a55362055a81
Parent:   b0d57edc051b50743ebd8b9521d261a8f8529f6b
Author:   thijsalkemade at gmail.com
Date:     08/19/11 12:15:45
Branch:   im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/f69b22b713390e0c56594cd15494c119222f7ca2

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 29484df15413fe3bbd21bbfcef26a55362055a81)
            to branch 'im.pidgin.adium' (head b0d57edc051b50743ebd8b9521d261a8f8529f6b)

Changes against parent 29484df15413fe3bbd21bbfcef26a55362055a81

  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

Changes against parent b0d57edc051b50743ebd8b9521d261a8f8529f6b

  added    .tx
  added    .tx/config
  patched  .mtn-ignore
  patched  COPYRIGHT
  patched  ChangeLog
  patched  configure.ac
  patched  libpurple/dnssrv.c
  patched  libpurple/log.c
  patched  libpurple/nat-pmp.c
  patched  libpurple/ntlm.c
  patched  libpurple/plugins/filectl.c
  patched  libpurple/plugins/tcl/tcl_ref.c
  patched  libpurple/plugins/tcl/tcl_signals.c
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/win32/posix.uname.c
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/cmdproc.h
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/switchboard.h
  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/yahoo_filexfer.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/stringref.c
  patched  libpurple/stun.c
  patched  libpurple/tests/test_util.c
  patched  libpurple/win32/libc_interface.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/pixmaps/Makefile.am
  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