pidgin: 299ec0ee: merge of '5378b2067023c1be51d87906196d87...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 299ec0ee11e4503b5d14774fe7ffadd79b3de6b3
Ancestor: 5378b2067023c1be51d87906196d87f03c9992e3
Ancestor: da604206b18f52b79c03f5cdd11dc0438e46038b
Author: qulogic at pidgin.im
Date: 2010-05-07T20:04:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/299ec0ee11e4503b5d14774fe7ffadd79b3de6b3

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API libpurple/account.c
        libpurple/account.h libpurple/ft.c libpurple/ft.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/gg/search.c
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/auth_digest_md5.c
        libpurple/protocols/jabber/auth_plain.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/slp.c libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq.c libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/request.c libpurple/request.h
        libpurple/tests/test_util.c libpurple/util.c pidgin/gtkft.c
        pidgin/gtkrequest.c pidgin/plugins/timestamp_format.c
        po/ca.po po/ca at valencia.po po/de.po

ChangeLog: 

merge of '5378b2067023c1be51d87906196d87f03c9992e3'
     and 'da604206b18f52b79c03f5cdd11dc0438e46038b'