pidgin: 0068cedd: merge of 'c21c65b2cb75f7371f96b652c904d2...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 0068cedd03804855a4ded8aeb153ccaffb8158bc
Ancestor: c21c65b2cb75f7371f96b652c904d2d83a072cc5
Ancestor: e8317a2ca5bf7c56db936d94d75c0a92d1432d7a
Author: paul at darkrain42.org
Date: 2009-04-11T17:41:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0068cedd03804855a4ded8aeb153ccaffb8158bc

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API finch/gntconv.c
        finch/gntmedia.c libpurple/account.c libpurple/blist.c
        libpurple/blist.h libpurple/conversation.c
        libpurple/conversation.h libpurple/media.c
        libpurple/mediamanager.c
        libpurple/protocols/bonjour/jabber.c pidgin/gtkconv.c

ChangeLog: 

merge of 'c21c65b2cb75f7371f96b652c904d2d83a072cc5'
     and 'e8317a2ca5bf7c56db936d94d75c0a92d1432d7a'