pidgin: 747f7586: merge of '02982091b25d51cf15064b67811f0f...

Sun May 3 16:20:31 EDT 2009

-----------------------------------------------------------------
Revision: 747f7586a776a69a1fba475128617b8bfe6a649b
Ancestor: 02982091b25d51cf15064b67811f0ff347e3ec48
Ancestor: acf47162ca3864daf33d64a93e65604bf88ec07e
Author: darkrain42 at pidgin.im
Date: 2009-05-03T20:18:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/747f7586a776a69a1fba475128617b8bfe6a649b

Modified files:
        ChangeLog ChangeLog.API doc/blist-signals.dox
        libpurple/blist.c libpurple/plugins/signals-test.c
        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 pidgin/gtkconv.c
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in po/ca.po

ChangeLog: 

merge of '02982091b25d51cf15064b67811f0ff347e3ec48'
     and 'acf47162ca3864daf33d64a93e65604bf88ec07e'