pidgin.next.minor: b299a165: merge of '0bf6462dd433df38943094bbed0393...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: b299a165920a9d922e9b8c27b4c879c77b43efe1
Ancestor: 0bf6462dd433df38943094bbed0393698d91a037
Ancestor: 9c4b346f6536ab35c06e2c6cabb905bae60c420d
Author: sadrul at pidgin.im
Date: 2008-12-13T21:13:04
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/b299a165920a9d922e9b8c27b4c879c77b43efe1

Deleted entries:
        libpurple/protocols/myspace/CHANGES
        libpurple/protocols/myspace/ChangeLog
        libpurple/protocols/myspace/LICENSE
        libpurple/protocols/myspace/release.sh
Modified files:
        COPYING COPYRIGHT ChangeLog configure.ac
        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/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/im.c
        pidgin/plugins/perl/common/GtkIMHtml.xs po/de.po

ChangeLog: 

merge of '0bf6462dd433df38943094bbed0393698d91a037'
     and '9c4b346f6536ab35c06e2c6cabb905bae60c420d'