im.pidgin.pidgin: 9c11352104fa6f335fcb0a53b69bebaed59da7bb

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 9c11352104fa6f335fcb0a53b69bebaed59da7bb
Ancestor: 773c6dde93b5b2109d9c627dca717dd6c5468094
Ancestor: d25af79abd2f50e0aba4985544f0ca976d0e7788
Author: rekkanoryo at pidgin.im
Date: 2008-01-17T05:53:25
Branch: im.pidgin.pidgin

Modified files:
        libpurple/dnssrv.c libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
        libpurple/prpl.h

ChangeLog: 

merge of '773c6dde93b5b2109d9c627dca717dd6c5468094'
     and 'd25af79abd2f50e0aba4985544f0ca976d0e7788'