pidgin: c12f5853: merge of 'bad096432d2d601b84837925471454...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: c12f585374ee631039d4e0e6f8fac345be1148ad
Ancestor: bad096432d2d601b84837925471454773c42d1f7
Ancestor: c6702617a937bd0b77620c209828d57563cc3f87
Author: qulogic at pidgin.im
Date: 2010-02-24T05:05:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c12f585374ee631039d4e0e6f8fac345be1148ad

Modified files:
        ChangeLog libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/bonjour/mdns_avahi.c pidgin/gtkblist.c
        pidgin/pidginstock.c pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of 'bad096432d2d601b84837925471454773c42d1f7'
     and 'c6702617a937bd0b77620c209828d57563cc3f87'