pidgin: e06b62ba: merge of 'a1538be1e201a9daf8b56e0a577860...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: e06b62ba5d701408348cb69f6acaf7df1fde2d17
Ancestor: a1538be1e201a9daf8b56e0a577860252391350a
Ancestor: f95421dc790bdc0c5db0ad71d10621cfcf131474
Author: rekkanoryo at pidgin.im
Date: 2009-08-18T03:34:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e06b62ba5d701408348cb69f6acaf7df1fde2d17

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/msn/msn.h 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
        pidgin/win32/nsis/translations/italian.nsh po/ChangeLog
        po/eo.po

ChangeLog: 

merge of 'a1538be1e201a9daf8b56e0a577860252391350a'
     and 'f95421dc790bdc0c5db0ad71d10621cfcf131474'