pidgin.vv: 38031eda: merge of 'a38c44e88ee54fa639c5d924a51006...

Tue Jan 13 13:49:47 EST 2009

-----------------------------------------------------------------
Revision: 38031eda38655d87862feafe0580344c910908b1
Ancestor: a38c44e88ee54fa639c5d924a5100699df189a26
Ancestor: e72ddc7f90a0fe1fa018263ba764ffa193e330f0
Author: malu at pidgin.im
Date: 2009-01-13T12:24:39
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/38031eda38655d87862feafe0580344c910908b1

Modified files:
        libpurple/media.c pidgin/gtkmedia.c

ChangeLog: 

merge of 'a38c44e88ee54fa639c5d924a5100699df189a26'
     and 'e72ddc7f90a0fe1fa018263ba764ffa193e330f0'