pidgin: 3bb16ff5: merge of '2481b51dce05a40973c023cb3c62c6...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 3bb16ff558e43f80f9044fd6d1ab7d66adaad761
Ancestor: 2481b51dce05a40973c023cb3c62c66b082e11bf
Ancestor: 747f7586a776a69a1fba475128617b8bfe6a649b
Author: qulogic at pidgin.im
Date: 2009-05-03T23:09:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3bb16ff558e43f80f9044fd6d1ab7d66adaad761

Modified files:
        ChangeLog libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/qq/qq_crypt.c po/ca.po

ChangeLog: 

merge of '2481b51dce05a40973c023cb3c62c66b082e11bf'
     and '747f7586a776a69a1fba475128617b8bfe6a649b'