pidgin: 804c33ea: merge of '2833fd1d337477c5b6efc4247a9e61...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 804c33ea1801eb94c86168d56164585ac1456ca9
Ancestor: 2833fd1d337477c5b6efc4247a9e6127580414ea
Ancestor: 4831edb99cb3b9420b5fc9cee492184c163b291b
Author: darkrain42 at pidgin.im
Date: 2009-04-27T17:01:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/804c33ea1801eb94c86168d56164585ac1456ca9

Added files:
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/useravatar.h
Modified files:
        ChangeLog libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/qq.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of '2833fd1d337477c5b6efc4247a9e6127580414ea'
     and '4831edb99cb3b9420b5fc9cee492184c163b291b'