pidgin: 580055bb: merge of '8952794c1397b9cba4b98accf0639b...

Sun Apr 12 20:00:44 EDT 2009

-----------------------------------------------------------------
Revision: 580055bb22fea0076d3a90d9df9346abd1789bab
Ancestor: 8952794c1397b9cba4b98accf0639bb5499387d4
Ancestor: a0102873e8bacb2e83f697a4f7b7ba500ea806bd
Author: paul at darkrain42.org
Date: 2009-04-12T23:57:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/580055bb22fea0076d3a90d9df9346abd1789bab

Modified files:
        libpurple/Makefile.mingw libpurple/media.c
        libpurple/mediamanager.c pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme.c pidgin/gtkblist-theme.h
        pidgin/gtkblist.c

ChangeLog: 

merge of '8952794c1397b9cba4b98accf0639bb5499387d4'
     and 'a0102873e8bacb2e83f697a4f7b7ba500ea806bd'