pidgin: cbb83bec: merge of '7f9fb74cf1c1ea058b2681f2246d9d...

Sun Aug 30 00:35:39 EDT 2009

-----------------------------------------------------------------
Revision: cbb83beca15a32e1008831042c03b602bba4f0e9
Ancestor: 7f9fb74cf1c1ea058b2681f2246d9da4e6e42f51
Ancestor: 955931f06c0f4801399946e6819b53f67714e73e
Author: darkrain42 at pidgin.im
Date: 2009-08-30T04:31:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cbb83beca15a32e1008831042c03b602bba4f0e9

Modified files:
        libpurple/media-gst.h libpurple/media.c libpurple/media.h
        libpurple/mediamanager.h pidgin/gtkmedia.c po/ChangeLog
        po/it.po po/pt_BR.po

ChangeLog: 

merge of '7f9fb74cf1c1ea058b2681f2246d9da4e6e42f51'
     and '955931f06c0f4801399946e6819b53f67714e73e'