pidgin: e82aa333: merge of '0a7ca4f8823e2b4c92a9fdac0c7a81...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: e82aa33311b15eaad3c08326fb27ae68818307cf
Ancestor: 0a7ca4f8823e2b4c92a9fdac0c7a81f3ee853de5
Ancestor: 4185001f1d8e8d7c894fa194202f7051f06cb59f
Author: darkrain42 at pidgin.im
Date: 2009-12-03T05:43:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e82aa33311b15eaad3c08326fb27ae68818307cf

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 '0a7ca4f8823e2b4c92a9fdac0c7a81f3ee853de5'
     and '4185001f1d8e8d7c894fa194202f7051f06cb59f'