cpw.rekkanoryo.icqxstatus: f7ee0112: merge of '88e861487c0bb038a99ebb6d7675ae...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f7ee01128f9373b2d98f537af9109a36acc58d1e
Ancestor: 88e861487c0bb038a99ebb6d7675ae45f749e799
Ancestor: c7a31c2a657883fbaf9577a5d0fd7c2b7731e207
Author: darkrain42 at pidgin.im
Date: 2010-02-09T22:39:08
Branch: im.pidgin.cpw.rekkanoryo.icqxstatus
URL: http://d.pidgin.im/viewmtn/revision/info/f7ee01128f9373b2d98f537af9109a36acc58d1e

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h pidgin/gtkblist.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/small/16/Makefile.am

ChangeLog: 

merge of '88e861487c0bb038a99ebb6d7675ae45f749e799'
     and 'c7a31c2a657883fbaf9577a5d0fd7c2b7731e207'