im.pidgin.pidgin: 2654fa4bf505fd6b8e400e329323a4b8fb67126f

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 2654fa4bf505fd6b8e400e329323a4b8fb67126f
Ancestor: 6523df90f67ed0428e11d3ebc7bf15777986ebcf
Ancestor: d567c3024540efcf356b0e1201e926ef551c8ec6
Author: sadrul at pidgin.im
Date: 2008-01-10T02:28:42
Branch: im.pidgin.pidgin

Modified files:
        libpurple/account.c libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_types.h
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/yahoo/yahoo.c pidgin/gtkaccount.c
        pidgin/plugins/convcolors.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '6523df90f67ed0428e11d3ebc7bf15777986ebcf'
     and 'd567c3024540efcf356b0e1201e926ef551c8ec6'