pidgin: 70d69397: merge of '777b9e651a771f8fac5e480e094c74...

Thu Aug 13 22:54:09 EDT 2009

-----------------------------------------------------------------
Revision: 70d69397ed952b26b453423c381c70d6783eb66d
Ancestor: 777b9e651a771f8fac5e480e094c740ee495ca06
Ancestor: de756219d6c0b43445596e8b6a82fa5b6edd18ff
Author: darkrain42 at pidgin.im
Date: 2009-08-13T15:56:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/70d69397ed952b26b453423c381c70d6783eb66d

Modified files:
        ChangeLog libpurple/media.c libpurple/mediamanager.c
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h pidgin/gtkmedia.c

ChangeLog: 

merge of '777b9e651a771f8fac5e480e094c740ee495ca06'
     and 'de756219d6c0b43445596e8b6a82fa5b6edd18ff'