pidgin.next.minor: 6d87b28f: merge of '6a184b4a50c778257ab194f0339b91...

Sat Oct 31 14:01:31 EDT 2009

-----------------------------------------------------------------
Revision: 6d87b28fb7d202e9e5cf6700c99d9f140fdcd245
Ancestor: 6a184b4a50c778257ab194f0339b91beda1f97c8
Ancestor: d6d5f18ff695ad46c11336cf3301aa955b41d5bb
Author: rekkanoryo at pidgin.im
Date: 2009-10-31T17:49:11
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/6d87b28fb7d202e9e5cf6700c99d9f140fdcd245

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        libpurple/blist.c libpurple/blist.h libpurple/certificate.c
        libpurple/ft.h libpurple/marshallers.list libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/prpl.c
        libpurple/prpl.h libpurple/tests/test_jabber_jutil.c
        pidgin/gtkmedia.c pidgin/gtkroomlist.c pidgin/gtkutils.c
        pidgin/plugins/disco/gtkdisco.c po/ChangeLog

ChangeLog: 

merge of '6a184b4a50c778257ab194f0339b91beda1f97c8'
     and 'd6d5f18ff695ad46c11336cf3301aa955b41d5bb'