pidgin: 8b1c0ea0: merge of '006d5deacf5a5a7ed5e6410903c381...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 8b1c0ea0c8e51378ba48d90d3f06867ea01c0fba
Ancestor: 006d5deacf5a5a7ed5e6410903c3815794845ce9
Ancestor: c6f48a020334f1614d2363fdc8f52c3ea71a0018
Author: qulogic at pidgin.im
Date: 2008-07-29T07:02:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8b1c0ea0c8e51378ba48d90d3f06867ea01c0fba

Modified files:
        AUTHORS ChangeLog.win32 doc/funniest_home_convos.txt
        doc/pidgin.1.in libpurple/plugins/perl/Makefile.mingw
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/win32/global.mak
        pidgin/gtkdialogs.c pidgin/gtkroomlist.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/winpidgin.c po/zh_CN.po po/zh_TW.po

ChangeLog: 

merge of '006d5deacf5a5a7ed5e6410903c3815794845ce9'
     and 'c6f48a020334f1614d2363fdc8f52c3ea71a0018'