pidgin: edd569c9: merge of '3ec6c363917ec3d2ab175d9e68ed1b...

Fri Aug 7 13:16:06 EDT 2009

-----------------------------------------------------------------
Revision: edd569c9522df52af33d6132a9d4955bd842f9bb
Ancestor: 3ec6c363917ec3d2ab175d9e68ed1b9b8bb848fa
Ancestor: 74d121b6673d769eb89a8ddcab15d8e31cbee94a
Author: darkrain42 at pidgin.im
Date: 2009-08-07T17:12:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/edd569c9522df52af33d6132a9d4955bd842f9bb

Modified files:
        ChangeLog finch/gntmedia.c libpurple/marshallers.list
        libpurple/media.c libpurple/media.h libpurple/mediamanager.c
        pidgin/gtkconv.c pidgin/gtkmedia.c

ChangeLog: 

merge of '3ec6c363917ec3d2ab175d9e68ed1b9b8bb848fa'
     and '74d121b6673d769eb89a8ddcab15d8e31cbee94a'