pidgin: 4185001f: merge of 'aa4524ddbe6f9ac48cb518a473fdc6...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 4185001f1d8e8d7c894fa194202f7051f06cb59f
Ancestor: aa4524ddbe6f9ac48cb518a473fdc68773665bef
Ancestor: d612071593881b9ae7e92a1820cf13d3e45b1f94
Author: darkrain42 at pidgin.im
Date: 2009-12-03T05:38:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4185001f1d8e8d7c894fa194202f7051f06cb59f

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        libpurple/ft.c libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/oscar.c libpurple/proxy.c
        libpurple/xmlnode.c pidgin/plugins/disco/gtkdisco.c
        po/ChangeLog po/af.po po/ca.po po/ca at valencia.po po/cs.po
        po/de.po po/he.po po/nn.po po/pl.po po/ru.po po/sl.po
        po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of 'aa4524ddbe6f9ac48cb518a473fdc68773665bef'
     and 'd612071593881b9ae7e92a1820cf13d3e45b1f94'