im.pidgin.pidgin: cdf52b5277a86a98fed917e2a6a51e3c9c8b8784

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: cdf52b5277a86a98fed917e2a6a51e3c9c8b8784
Ancestor: 134d744543dd1085b75aefb7171ca8dd76b343d4
Ancestor: 98b3238f949c219e8e1869d20e203774164fdb89
Author: lschiere at pidgin.im
Date: 2007-11-16T03:26:08
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog ChangeLog.win32 libpurple/blist.h
        libpurple/protocols/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_howl.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/yahoo/yahoo.c pidgin/Makefile.am
        pidgin/minidialog.c pidgin/win32/gtkwin32dep.c
        pidgin/win32/winpidgin.c po/ChangeLog po/de.po po/fi.po
        po/pt_BR.po po/ro.po po/te.po

ChangeLog: 

merge of '134d744543dd1085b75aefb7171ca8dd76b343d4'
     and '98b3238f949c219e8e1869d20e203774164fdb89'