pidgin: d6127034: merge of 'ba801ec16bca2ebd4892b49014d12b...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: d6127034539bfd7c911dcc2ffab1ca7bc7e99dbb
Ancestor: ba801ec16bca2ebd4892b49014d12b72df8aea03
Ancestor: e06b62ba5d701408348cb69f6acaf7df1fde2d17
Author: rekkanoryo at pidgin.im
Date: 2009-08-18T03:39:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d6127034539bfd7c911dcc2ffab1ca7bc7e99dbb

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        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
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in po/ChangeLog
        po/eo.po

ChangeLog: 

merge of 'ba801ec16bca2ebd4892b49014d12b72df8aea03'
     and 'e06b62ba5d701408348cb69f6acaf7df1fde2d17'