pidgin: ba6f2a0a: merge of '665a07783e325291cdd356dacf8f39...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: ba6f2a0aa47088afe04b45a8eafd245fa72c9985
Ancestor: 665a07783e325291cdd356dacf8f394fb18f0031
Ancestor: 814d53152c168c9c4732b3d084260711d536fba6
Author: kstange at pidgin.im
Date: 2008-12-19T08:10:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ba6f2a0aa47088afe04b45a8eafd245fa72c9985

Deleted entries:
        libpurple/protocols/myspace/CHANGES
        libpurple/protocols/myspace/ChangeLog
        libpurple/protocols/myspace/LICENSE
        libpurple/protocols/myspace/release.sh
Modified files:
        COPYING COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        NEWS configure.ac libpurple/account.c libpurple/blist.c
        libpurple/blist.h libpurple/certificate.c libpurple/cmds.h
        libpurple/connection.h libpurple/conversation.h
        libpurple/dnssrv.c libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/AccountOpts.xs
        libpurple/plugins/perl/common/Certificate.xs
        libpurple/plugins/perl/common/Conversation.xs
        libpurple/plugins/perl/common/Prefs.xs
        libpurple/plugins/perl/common/Roomlist.xs
        libpurple/plugins/perl/common/Status.xs
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/message.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/persist.h
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
        libpurple/protocols/qq/packet_parse.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc10/wb.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.h
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/prpl.h libpurple/smiley.c libpurple/sslconn.c
        libpurple/status.h libpurple/util.c
        libpurple/win32/global.mak pidgin/gtkblist.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkutils.c
        pidgin/plugins/perl/common/GtkIMHtml.xs
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/af.po
        po/ar.po po/bn.po po/ca.po po/ca at valencia.po po/check_po.pl
        po/cs.po po/de.po po/el.po po/es.po po/fi.po po/fr.po
        po/gl.po po/hu.po po/nn.po po/pt_BR.po po/ro.po po/sk.po
        po/sl.po po/sq.po po/sr.po po/sr at latin.po po/sv.po
        po/zh_HK.po po/zh_TW.po share/ca-certs/Makefile.am
        share/ca-certs/Microsoft_Internet_Authority.pem
        share/ca-certs/Microsoft_Secure_Server_Authority.pem

ChangeLog: 

merge of '665a07783e325291cdd356dacf8f394fb18f0031'
     and '814d53152c168c9c4732b3d084260711d536fba6'