pidgin: 2949e994: merge of '193869c7b6c12d13ccb96d731ceb8f...

Mon Aug 31 20:36:10 EDT 2009

-----------------------------------------------------------------
Revision: 2949e994d1c2ef834be0dd1800e164e39edc880f
Ancestor: 193869c7b6c12d13ccb96d731ceb8fe5f3a82f2d
Ancestor: ea05c841d86670f2d6d02024b5dd61d126f18b39
Author: qulogic at pidgin.im
Date: 2009-09-01T00:34:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2949e994d1c2ef834be0dd1800e164e39edc880f

Modified files:
        libpurple/protocols/jabber/data.c libpurple/theme-loader.c
        libpurple/theme-loader.h libpurple/theme.c libpurple/theme.h
        pidgin/pidginstock.c

ChangeLog: 

merge of '193869c7b6c12d13ccb96d731ceb8fe5f3a82f2d'
     and 'ea05c841d86670f2d6d02024b5dd61d126f18b39'