pidgin: bd8c029c: merge of '5b3cd3600d9a992cc943d490b68c11...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: bd8c029cb2bab77ad4fc6e904e21bbcc9e698fd2
Ancestor: 5b3cd3600d9a992cc943d490b68c1174e0346b8b
Ancestor: 9335e6559861d8cef4214b09234d1f588ff07f74
Author: qulogic at pidgin.im
Date: 2008-07-23T05:44:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bd8c029cb2bab77ad4fc6e904e21bbcc9e698fd2

Modified files:
        COPYRIGHT ChangeLog ChangeLog.win32
        libpurple/protocols/irc/cmds.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/parse.c
        libpurple/protocols/msn/page.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c
        pidgin/pidgintooltip.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '5b3cd3600d9a992cc943d490b68c1174e0346b8b'
     and '9335e6559861d8cef4214b09234d1f588ff07f74'