im.pidgin.pidgin: 1d36a128301cae57a790a087aa9c4ad8d71dad52

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 1d36a128301cae57a790a087aa9c4ad8d71dad52
Ancestor: 5d1f7fb3ad5d13827b161c3d115fb82e9826fe2c
Ancestor: d275feb891040092b840d7cc48797e0a16e8a757
Author: khc at pidgin.im
Date: 2007-10-26T05:24:14
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/yahoo/yahoo_aliases.c

ChangeLog: 

merge of '5d1f7fb3ad5d13827b161c3d115fb82e9826fe2c'
     and 'd275feb891040092b840d7cc48797e0a16e8a757'