im.pidgin.pidgin: 3b04d5ecc995b2c4af8919299fcc785383d82ded

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 3b04d5ecc995b2c4af8919299fcc785383d82ded
Ancestor: 7a1ce8ae9c2809b39d1f436d94070523f18993fb
Ancestor: 94d88332e1e7b8227ef79d0d74873475069c85f4
Author: resiak at soc.pidgin.im
Date: 2007-12-17T12:10:55
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog libpurple/account.c libpurple/buddyicon.c
        libpurple/plugins/perl/common/Prpl.xs
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/libxmpp.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/plugins/pidginrc.c

ChangeLog: 

merge of '7a1ce8ae9c2809b39d1f436d94070523f18993fb'
     and '94d88332e1e7b8227ef79d0d74873475069c85f4'