pidgin: a24ba8f3: merge of '28778df3113382d631f8cf40ff35a2...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: a24ba8f3be7fe637dd9123af47b4c500944f40ae
Ancestor: 28778df3113382d631f8cf40ff35a26ca515513f
Ancestor: ff248f7206a9d4924256440c85e52b5355025efb
Author: maiku at soc.pidgin.im
Date: 2009-06-02T21:41:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a24ba8f3be7fe637dd9123af47b4c500944f40ae

Modified files:
        ChangeLog libpurple/media.c

ChangeLog: 

merge of '28778df3113382d631f8cf40ff35a26ca515513f'
     and 'ff248f7206a9d4924256440c85e52b5355025efb'