pidgin: 7f9fb74c: merge of '5d14e84215d9f285f65ff268476a8c...

Sun Aug 30 00:15:37 EDT 2009

-----------------------------------------------------------------
Revision: 7f9fb74cf1c1ea058b2681f2246d9da4e6e42f51
Ancestor: 5d14e84215d9f285f65ff268476a8c9a395e6f7f
Ancestor: 6aaac4c2ade05169219a85683c8fceda40bf29ca
Author: maiku at pidgin.im
Date: 2009-08-30T04:10:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7f9fb74cf1c1ea058b2681f2246d9da4e6e42f51

Modified files:
        libpurple/blist.h libpurple/conversation.h libpurple/core.h
        libpurple/dnssrv.h libpurple/media-gst.h libpurple/media.c
        libpurple/media.h libpurple/mediamanager.h
        libpurple/smiley.h libpurple/status.h libpurple/util.h
        pidgin/gtkimhtml.h pidgin/gtkmedia.c

ChangeLog: 

merge of '5d14e84215d9f285f65ff268476a8c9a395e6f7f'
     and '6aaac4c2ade05169219a85683c8fceda40bf29ca'