pidgin: b9696949: merge of 'd1ef38716fb62522b4d8ce47ed39d9

Sun Mar 2 11:45:54 EST 2008

-----------------------------------------------------------------
Revision: b96969495e3d246fafa8dc2df46eaa91d491d0a2
Ancestor: d1ef38716fb62522b4d8ce47ed39d9e34d2b2c77
Ancestor: f30db84d0b905aeecbbe516037ffdd572852b313
Author: sadrul at pidgin.im
Date: 2008-03-02T16:43:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b96969495e3d246fafa8dc2df46eaa91d491d0a2

Modified files:
        libpurple/plugin.c libpurple/protocols/jabber/Makefile.mingw
        libpurple/win32/global.mak pidgin/gtkplugin.c

ChangeLog: 

merge of 'd1ef38716fb62522b4d8ce47ed39d9e34d2b2c77'
     and 'f30db84d0b905aeecbbe516037ffdd572852b313'