pidgin: 885a0507: merge of '249bb0ae011a3aacadd09bca9106b7...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 885a050793fc941cdb0bbed6b1a56b14bdeab45d
Ancestor: 249bb0ae011a3aacadd09bca9106b7ba41bf6b75
Ancestor: dbc7434de32f5fbc5c23e94da10bed56418bfeab
Author: rekkanoryo at pidgin.im
Date: 2009-08-18T14:59:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/885a050793fc941cdb0bbed6b1a56b14bdeab45d

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        libpurple/plugins/perl/common/XMLNode.xs
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/yahoo/libymsg.c libpurple/status.h
        libpurple/util.c
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in po/ChangeLog
        po/eo.po

ChangeLog: 

merge of '249bb0ae011a3aacadd09bca9106b7ba41bf6b75'
     and 'dbc7434de32f5fbc5c23e94da10bed56418bfeab'