pidgin: 030ca835: merge of 'e4b10961a2266d17625787c506f1b2...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 030ca835c7587163eaabbe46fcca8596be10594b
Ancestor: e4b10961a2266d17625787c506f1b258ffa97873
Ancestor: f25348fdce436002d7d508f074aaa70fd9491f01
Author: maiku at soc.pidgin.im
Date: 2009-04-03T19:29:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/030ca835c7587163eaabbe46fcca8596be10594b

Modified files:
        libpurple/media.c libpurple/media.h libpurple/mediamanager.c

ChangeLog: 

merge of 'e4b10961a2266d17625787c506f1b258ffa97873'
     and 'f25348fdce436002d7d508f074aaa70fd9491f01'