pidgin: 84167204: merge of '22d261d19f56b8cec771b7511f11db...

Mon Apr 6 02:16:32 EDT 2009

-----------------------------------------------------------------
Revision: 841672049df567aa898d7cbce212f804b209b220
Ancestor: 22d261d19f56b8cec771b7511f11dbbc367568fc
Ancestor: 31a22532aee37e26e4131412a959ecb9575dc979
Author: qulogic at pidgin.im
Date: 2009-04-06T06:11:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/841672049df567aa898d7cbce212f804b209b220

Modified files:
        configure.ac libpurple/Makefile.am pidgin/gtkmedia.c

ChangeLog: 

merge of '22d261d19f56b8cec771b7511f11dbbc367568fc'
     and '31a22532aee37e26e4131412a959ecb9575dc979'